mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-18 03:15:28 +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);
|
||||
}
|
||||
@@ -37,7 +37,6 @@ import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.apiculture.IBeeSpriteColourProvider;
|
||||
import forestry.api.apiculture.IJubilanceProvider;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.IModelProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
@@ -180,11 +179,11 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
|
||||
public boolean isJubilant(IBeeGenome genome, IBeeHousing housing) {
|
||||
return jubilanceProvider.isJubilant(this, genome, housing);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IModelProvider getModelProvider() {
|
||||
return new BeeModelProviderWrapper(beeModelProvider);
|
||||
@Override
|
||||
public void registerModels(Item item, IModelManager manager){
|
||||
beeModelProvider.registerModels(item, manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -201,24 +200,4 @@ public class AlleleBeeSpecies extends AlleleSpecies implements IAlleleBeeSpecies
|
||||
public String getEntityTexture() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private static class BeeModelProviderWrapper implements IModelProvider {
|
||||
|
||||
private final IBeeModelProvider beeModelProvider;
|
||||
|
||||
public BeeModelProviderWrapper(IBeeModelProvider beeModelProvider) {
|
||||
this.beeModelProvider = beeModelProvider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ModelResourceLocation getModel() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels(Item item, IModelManager manager) {
|
||||
beeModelProvider.registerModels(item, manager);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -60,16 +60,6 @@ public class ItemBeeGE extends ItemGE {
|
||||
return BeeGenome.getSpecies(itemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDefaultPrimaryColour() {
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDefaultSecondaryColour() {
|
||||
return 0xffdc16;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack itemstack) {
|
||||
|
||||
@@ -125,16 +115,22 @@ public class ItemBeeGE extends ItemGE {
|
||||
}
|
||||
}
|
||||
|
||||
/* RENDERING */
|
||||
/* MODELS */
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
|
||||
if (!itemstack.hasTagCompound()) {
|
||||
return super.getColorFromItemStack(itemstack, renderPass);
|
||||
if (renderPass == 1) {
|
||||
return 0xffdc16;
|
||||
} else {
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
return getColourFromSpecies(BeeGenome.getSpecies(itemstack), renderPass);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public int getColourFromSpecies(IAlleleSpecies species, int renderPass) {
|
||||
|
||||
@@ -146,13 +142,12 @@ public class ItemBeeGE extends ItemGE {
|
||||
|
||||
}
|
||||
|
||||
/* MODELS */
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
if (allele instanceof IAlleleBeeSpecies) {
|
||||
((IAlleleBeeSpecies) allele).getModelProvider().registerModels(item, manager);
|
||||
((IAlleleBeeSpecies) allele).registerModels(item, manager);
|
||||
}
|
||||
}
|
||||
manager.registerItemModel(item, new BeeMeshDefinition());
|
||||
@@ -164,8 +159,7 @@ public class ItemBeeGE extends ItemGE {
|
||||
public ModelResourceLocation getModelLocation(ItemStack stack) {
|
||||
IAlleleBeeSpecies species = (IAlleleBeeSpecies) getSpecies(stack);
|
||||
if (species == null) {
|
||||
species = (IAlleleBeeSpecies) BeeManager.beeRoot.getDefaultTemplate()[EnumBeeChromosome.SPECIES
|
||||
.ordinal()];
|
||||
species = (IAlleleBeeSpecies) BeeManager.beeRoot.getDefaultTemplate()[EnumBeeChromosome.SPECIES.ordinal()];
|
||||
}
|
||||
return species.getModel(type);
|
||||
}
|
||||
|
||||
@@ -440,7 +440,7 @@ public class PluginArboriculture extends BlankForestryPlugin {
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void textureHook(TextureStitchEvent.Pre event) {
|
||||
public void registerSprites(TextureStitchEvent.Pre event) {
|
||||
TextureLeaves.registerAllSprites();
|
||||
BlockFruitPod.registerSprites();
|
||||
}
|
||||
|
||||
@@ -34,7 +34,6 @@ import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
import forestry.api.core.IItemModelRegister;
|
||||
import forestry.api.core.IModelManager;
|
||||
@@ -93,16 +92,16 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat
|
||||
/* STATES */
|
||||
@Override
|
||||
public int getMetaFromState(IBlockState state) {
|
||||
return 0;
|
||||
return TREE.getAllowedValues().indexOf(state.getValue(TREE));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockState getStateFromMeta(int meta) {
|
||||
return getDefaultState().withProperty(TREE, TREE.getAllowedValues().get(meta));
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
|
||||
if (world.getTileEntity(pos) instanceof TileSapling) {
|
||||
TileSapling sapling = (TileSapling) world.getTileEntity(pos);
|
||||
IAlleleTreeSpecies species = sapling.getTree().getGenome().getPrimary();
|
||||
state = state.withProperty(TREE, species);
|
||||
}
|
||||
return super.getActualState(state, world, pos);
|
||||
}
|
||||
|
||||
@@ -116,6 +115,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat
|
||||
Proxies.render.registerStateMapper(this, new SaplingStateMapper());
|
||||
}
|
||||
|
||||
/* MODELS */
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
@@ -139,7 +139,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat
|
||||
@Override
|
||||
public void onNeighborBlockChange(World world, BlockPos pos, IBlockState state, Block neighborBlock) {
|
||||
super.onNeighborBlockChange(world, pos, state, neighborBlock);
|
||||
if (!world.isRemote && !this.canBlockStay(world, pos)) {
|
||||
if (!world.isRemote && !canBlockStay(world, pos)) {
|
||||
dropAsSapling(world, pos);
|
||||
world.setBlockToAir(pos);
|
||||
}
|
||||
@@ -185,7 +185,6 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat
|
||||
}
|
||||
|
||||
/* GROWNING */
|
||||
|
||||
@Override
|
||||
public boolean canUseBonemeal(World world, Random rand, BlockPos pos, IBlockState state) {
|
||||
TileSapling saplingTile = getSaplingTile(world, pos);
|
||||
|
||||
@@ -3,7 +3,6 @@ package forestry.arboriculture.blocks.property;
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import forestry.api.arboriculture.IAlleleFruit;
|
||||
@@ -34,7 +33,7 @@ public class PropertyFruit extends PropertyAllele<IAlleleFruit> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<IAlleleFruit> getAllowedValues() {
|
||||
public List<IAlleleFruit> getAllowedValues() {
|
||||
List<IAlleleFruit> trees = new ArrayList<>();
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
if (allele instanceof IAlleleFruit) {
|
||||
|
||||
@@ -3,7 +3,6 @@ package forestry.arboriculture.blocks.property;
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import forestry.api.arboriculture.IAlleleTreeSpecies;
|
||||
@@ -33,7 +32,7 @@ public class PropertyTree extends PropertyAllele<IAlleleTreeSpecies> {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Collection<IAlleleTreeSpecies> getAllowedValues() {
|
||||
public List<IAlleleTreeSpecies> getAllowedValues() {
|
||||
List<IAlleleTreeSpecies> trees = new ArrayList<>();
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
if (allele instanceof IAlleleTreeSpecies) {
|
||||
|
||||
@@ -968,7 +968,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
|
||||
ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary);
|
||||
IGermlingModelProvider germlingIconProvider = new ModelProviderGermlingVanilla(vanillaMeta);
|
||||
|
||||
IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this);
|
||||
IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, "forestry", modelName, leafIconProvider, germlingIconProvider, this);
|
||||
setSpeciesProperties(speciesBuilder);
|
||||
this.species = speciesBuilder.build();
|
||||
|
||||
@@ -988,7 +988,7 @@ public enum TreeDefinition implements ITreeDefinition, ITreeGenerator {
|
||||
ILeafSpriteProvider leafIconProvider = TreeManager.treeFactory.getLeafIconProvider(leafType, primary, secondary);
|
||||
IGermlingModelProvider germlingIconProvider = new ModelProviderGermling(uid);
|
||||
|
||||
IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, modelName, leafIconProvider, germlingIconProvider, this);
|
||||
IAlleleTreeSpeciesBuilder speciesBuilder = TreeManager.treeFactory.createSpecies(uid, unlocalizedName, "Sengir", unlocalizedDescription, dominant, branch.getBranch(), binomial, "forestry", modelName, leafIconProvider, germlingIconProvider, this);
|
||||
setSpeciesProperties(speciesBuilder);
|
||||
this.species = speciesBuilder.build();
|
||||
|
||||
|
||||
@@ -24,8 +24,8 @@ import forestry.arboriculture.render.SpriteProviderLeaves;
|
||||
|
||||
public class TreeFactory implements ITreeFactory {
|
||||
@Override
|
||||
public IAlleleTreeSpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean dominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafSpriteProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) {
|
||||
return new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modelName, leafSpriteProvider, germlingModelProvider, generator);
|
||||
public 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) {
|
||||
return new AlleleTreeSpecies(uid, unlocalizedName, authority, unlocalizedDescription, dominant, branch, binomial, modID, modelName, leafSpriteProvider, germlingModelProvider, generator);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -52,6 +52,7 @@ import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IMutation;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
import forestry.arboriculture.blocks.BlockFruitPod;
|
||||
import forestry.arboriculture.blocks.BlockSapling;
|
||||
import forestry.arboriculture.tiles.TileFruitPod;
|
||||
import forestry.arboriculture.tiles.TileSapling;
|
||||
import forestry.core.config.Constants;
|
||||
@@ -193,7 +194,7 @@ public class TreeRoot extends SpeciesRoot implements ITreeRoot {
|
||||
@Override
|
||||
public boolean plantSapling(World world, ITree tree, GameProfile owner, BlockPos pos) {
|
||||
|
||||
IBlockState state = PluginArboriculture.blocks.saplingGE.getStateFromMeta(0);
|
||||
IBlockState state = PluginArboriculture.blocks.saplingGE.getDefaultState().withProperty(BlockSapling.TREE, tree.getGenome().getPrimary());
|
||||
boolean placed = world.setBlockState(pos, state, Constants.FLAG_BLOCK_SYNCH_AND_UPDATE);
|
||||
if (!placed) {
|
||||
return false;
|
||||
|
||||
@@ -14,7 +14,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
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;
|
||||
@@ -29,7 +29,6 @@ import forestry.api.arboriculture.ITreeGenerator;
|
||||
import forestry.api.arboriculture.ITreeRoot;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.core.IModelProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.api.genetics.IFruitFamily;
|
||||
@@ -42,15 +41,18 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci
|
||||
private final List<IFruitFamily> fruits = new ArrayList<>();
|
||||
|
||||
private final String modelName;
|
||||
private final String modID;
|
||||
|
||||
private EnumPlantType nativeType = EnumPlantType.Plains;
|
||||
|
||||
public AlleleTreeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, String modelName, ILeafSpriteProvider leafIconProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) {
|
||||
public AlleleTreeSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, boolean isDominant, IClassification branch, String binomial, String modID, String modelName, ILeafSpriteProvider leafIconProvider, IGermlingModelProvider germlingModelProvider, ITreeGenerator generator) {
|
||||
super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial);
|
||||
|
||||
this.generator = generator;
|
||||
this.germlingModelProvider = germlingModelProvider;
|
||||
this.leafSpriteProvider = leafIconProvider;
|
||||
|
||||
this.modID = modID;
|
||||
this.modelName = modelName;
|
||||
}
|
||||
|
||||
@@ -119,25 +121,19 @@ public class AlleleTreeSpecies extends AlleleSpecies implements IAlleleTreeSpeci
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels(IModelManager manager) {
|
||||
germlingModelProvider.registerModels(manager);
|
||||
public void registerModels(Item item, IModelManager manager) {
|
||||
germlingModelProvider.registerModels(item, manager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModID() {
|
||||
return "forestry";
|
||||
return modID;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModelName() {
|
||||
return modelName;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public IModelProvider getModelProvider() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(IAlleleTreeSpecies o) {
|
||||
|
||||
@@ -77,16 +77,6 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable {
|
||||
return treeSpecies;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDefaultPrimaryColour() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDefaultSecondaryColour() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack itemstack) {
|
||||
if (!itemstack.hasTagCompound()) {
|
||||
@@ -117,6 +107,7 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable {
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
|
||||
return getSpeciesOrDefault(itemstack).getGermlingColour(type, renderPass);
|
||||
@@ -129,11 +120,12 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable {
|
||||
manager.registerItemModel(item, new GermlingMeshDefinition());
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
if (allele instanceof IAlleleTreeSpecies) {
|
||||
((IAlleleTreeSpecies) allele).registerModels(manager);
|
||||
((IAlleleTreeSpecies) allele).registerModels(item, manager);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private class GermlingMeshDefinition implements ItemMeshDefinition {
|
||||
@Override
|
||||
public ModelResourceLocation getModelLocation(ItemStack stack) {
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
package forestry.arboriculture.render;
|
||||
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.arboriculture.IGermlingModelProvider;
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.arboriculture.PluginArboriculture;
|
||||
|
||||
public class ModelProviderGermling implements IGermlingModelProvider {
|
||||
|
||||
@@ -30,11 +30,11 @@ public class ModelProviderGermling implements IGermlingModelProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels(IModelManager manager) {
|
||||
public void registerModels(Item item, IModelManager manager) {
|
||||
model = manager.getModelLocation("germlings/sapling." + name);
|
||||
manager.registerVariant(PluginArboriculture.items.sapling, new ResourceLocation("forestry:germlings/sapling." + name));
|
||||
manager.registerVariant(item, new ResourceLocation("forestry:germlings/sapling." + name));
|
||||
pollenModel = manager.getModelLocation("pollen");
|
||||
manager.registerVariant(PluginArboriculture.items.sapling, new ResourceLocation("forestry:pollen"));
|
||||
manager.registerVariant(item, new ResourceLocation("forestry:pollen"));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
package forestry.arboriculture.render;
|
||||
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import forestry.api.arboriculture.EnumGermlingType;
|
||||
import forestry.api.arboriculture.IGermlingModelProvider;
|
||||
import forestry.api.core.IModelManager;
|
||||
@@ -28,7 +28,7 @@ public class ModelProviderGermlingVanilla implements IGermlingModelProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerModels(IModelManager manager) {
|
||||
public void registerModels(Item item, IModelManager manager) {
|
||||
switch (vanillaMap) {
|
||||
case 0:
|
||||
model = manager.getModelLocation("minecraft", "oak_sapling");
|
||||
|
||||
@@ -34,7 +34,7 @@ public class TextureLeaves {
|
||||
|
||||
public static void registerAllSprites() {
|
||||
for (TextureLeaves leafTexture : leafTextures.values()) {
|
||||
leafTexture.registerIcons();
|
||||
leafTexture.registerSprites();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -48,7 +48,7 @@ public class TextureLeaves {
|
||||
this.leafType = enumLeafType;
|
||||
}
|
||||
|
||||
private void registerIcons() {
|
||||
private void registerSprites() {
|
||||
String ident = leafType.toString().toLowerCase(Locale.ENGLISH);
|
||||
|
||||
plain = TextureManager.registerSprite("blocks/leaves/" + ident + ".plain");
|
||||
|
||||
@@ -12,6 +12,8 @@ package forestry.core.blocks.propertys;
|
||||
|
||||
import net.minecraft.block.properties.IProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import forestry.api.genetics.IAlleleProperty;
|
||||
|
||||
public abstract class PropertyAllele<A extends IAlleleProperty<A>> implements IProperty<A> {
|
||||
@@ -39,4 +41,7 @@ public abstract class PropertyAllele<A extends IAlleleProperty<A>> implements IP
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public abstract List<A> getAllowedValues();
|
||||
|
||||
}
|
||||
@@ -14,14 +14,12 @@ import java.util.List;
|
||||
|
||||
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.EnumChatFormatting;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import forestry.api.core.IModelManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.core.items.ItemForestry;
|
||||
@@ -31,13 +29,9 @@ import forestry.core.utils.StringUtil;
|
||||
public abstract class ItemGE extends ItemForestry {
|
||||
protected ItemGE(CreativeTabs creativeTab) {
|
||||
super(creativeTab);
|
||||
hasSubtypes = true;
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
protected abstract int getDefaultPrimaryColour();
|
||||
|
||||
protected abstract int getDefaultSecondaryColour();
|
||||
|
||||
public abstract IIndividual getIndividual(ItemStack itemstack);
|
||||
|
||||
protected abstract IAlleleSpecies getSpecies(ItemStack itemStack);
|
||||
@@ -82,24 +76,7 @@ public abstract class ItemGE extends ItemForestry {
|
||||
}
|
||||
}
|
||||
|
||||
/* ICONS */
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
// Need to disable normal registration.
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
|
||||
if (renderPass == 0) {
|
||||
return getDefaultPrimaryColour();
|
||||
} else if (renderPass == 1) {
|
||||
return getDefaultSecondaryColour();
|
||||
} else {
|
||||
return 0xffffff;
|
||||
}
|
||||
}
|
||||
|
||||
public int getColourFromSpecies(IAlleleSpecies species, int renderPass) {
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
@@ -20,12 +20,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;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IAlleleSpeciesBuilder;
|
||||
@@ -186,8 +182,4 @@ public abstract class AlleleSpecies extends Allele implements IAlleleSpeciesBuil
|
||||
isCounted = false;
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public abstract IModelProvider getModelProvider();
|
||||
}
|
||||
@@ -0,0 +1,61 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2011-2014 SirSengir.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the GNU Lesser Public License v3
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.gnu.org/licenses/lgpl-3.0.txt
|
||||
*
|
||||
* Various Contributors including, but not limited to:
|
||||
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
|
||||
******************************************************************************/
|
||||
package forestry.core.models;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraftforge.client.model.ISmartItemModel;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public abstract class BlankItemModel implements ISmartItemModel {
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getFaceQuads(EnumFacing facing) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getGeneralQuads() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAmbientOcclusion() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGui3d() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isBuiltInRenderer() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getParticleTexture() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemCameraTransforms getItemCameraTransforms() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
/*******************************************************************************
|
||||
* Copyright (c) 2011-2014 SirSengir.
|
||||
* All rights reserved. This program and the accompanying materials
|
||||
* are made available under the terms of the GNU Lesser Public License v3
|
||||
* which accompanies this distribution, and is available at
|
||||
* http://www.gnu.org/licenses/lgpl-3.0.txt
|
||||
*
|
||||
* Various Contributors including, but not limited to:
|
||||
* SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges
|
||||
******************************************************************************/
|
||||
package forestry.core.models;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class DefaultTextureGetter implements Function<ResourceLocation, TextureAtlasSprite> {
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite apply(ResourceLocation location) {
|
||||
return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,28 +21,26 @@ import java.io.InputStreamReader;
|
||||
import java.io.Reader;
|
||||
import java.io.StringReader;
|
||||
import java.util.IdentityHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ModelBlock;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.resources.IResource;
|
||||
import net.minecraft.client.resources.model.IBakedModel;
|
||||
import net.minecraft.client.resources.model.ModelBakery;
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraftforge.client.ItemModelMesherForge;
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.IFlexibleBakedModel;
|
||||
import net.minecraftforge.client.model.IModel;
|
||||
import net.minecraftforge.client.model.ISmartItemModel;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.client.model.MultiModel;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -56,45 +54,53 @@ import forestry.storage.PluginStorage;
|
||||
import gnu.trove.map.hash.TIntObjectHashMap;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelCrate implements ISmartItemModel {
|
||||
public class ModelCrate extends BlankItemModel {
|
||||
|
||||
private final Map<String, MultiModel.Baked> crates = Maps.newHashMap();
|
||||
|
||||
public static IModel crateModel;
|
||||
private final Function<ResourceLocation, TextureAtlasSprite> textureGetter;
|
||||
public static ModelBlock MODEL_GENERATED;
|
||||
public static ModelBlock MODEL_COMPASS;
|
||||
public static ModelBlock MODEL_CLOCK;
|
||||
public static ModelLoader loader;
|
||||
private static IModel crateModel;
|
||||
private static ModelBlock MODEL_GENERATED;
|
||||
private static ModelBlock MODEL_COMPASS;
|
||||
private static ModelBlock MODEL_CLOCK;
|
||||
|
||||
public ModelCrate() {
|
||||
textureGetter = new CrateTextureGetter();
|
||||
/**
|
||||
* Init the model
|
||||
*/
|
||||
public static void initModel(ModelBakeEvent event){
|
||||
try {
|
||||
crateModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("forestry:crate-filled", "inventory"));
|
||||
MODEL_GENERATED = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 14);
|
||||
MODEL_COMPASS = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 15);
|
||||
MODEL_CLOCK = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 16);
|
||||
} catch (IOException e) {
|
||||
Log.error("Failed to bake crate model model.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* To bake the contained model
|
||||
* Bake the crate content models
|
||||
*/
|
||||
private ImmutableMap<String, IFlexibleBakedModel> bakeModels(ItemCrated crated) {
|
||||
private ImmutableMap<String, IFlexibleBakedModel> bakeContentModels(ItemCrated crateItem) {
|
||||
ImmutableMap.Builder<String, IFlexibleBakedModel> pb = ImmutableMap.builder();
|
||||
|
||||
IFlexibleBakedModel flexModel = getModel(crated.getContained());
|
||||
IFlexibleBakedModel containedModel = getModel(crateItem.getContained());
|
||||
|
||||
IdentityHashMap<Item, TIntObjectHashMap<ModelResourceLocation>> modelResourceLocations = ObfuscationReflectionHelper.getPrivateValue(ItemModelMesherForge.class, (ItemModelMesherForge) Minecraft.getMinecraft().getRenderItem().getItemModelMesher(), 0);
|
||||
|
||||
ModelResourceLocation modelResource = modelResourceLocations.get(crated.getContained().getItem()).get(crated.getContained().getItemDamage());
|
||||
ModelResourceLocation modelResource = modelResourceLocations.get(crateItem.getContained().getItem()).get(crateItem.getContained().getItemDamage());
|
||||
ResourceLocation location = getItemLocation(modelResource);
|
||||
|
||||
if (hasItemModel(location)) {
|
||||
pb.put(String.valueOf(0), new TRSRBakedModel(flexModel, -0.0625F, 0, 0.0625F, 0.5F));
|
||||
pb.put(String.valueOf(1), new TRSRBakedModel(flexModel, -0.0625F, 0, -0.0625F, 0.5F));
|
||||
pb.put(String.valueOf(0), new TRSRBakedModel(containedModel, -0.0625F, 0, 0.0625F, 0.5F));
|
||||
pb.put(String.valueOf(1), new TRSRBakedModel(containedModel, -0.0625F, 0, -0.0625F, 0.5F));
|
||||
} else {
|
||||
pb.put(String.valueOf(0), new TRSRBakedModel(flexModel, -0.0625F, 0, 0, 0.5F));
|
||||
pb.put(String.valueOf(0), new TRSRBakedModel(containedModel, -0.0625F, 0, 0, 0.5F));
|
||||
}
|
||||
return pb.build();
|
||||
}
|
||||
|
||||
/**
|
||||
* @return The item model {@link ResourceLocation} from the {@link ModelResourceLocation}
|
||||
* @return The item model {@link ResourceLocation} from a {@link ModelResourceLocation}
|
||||
*/
|
||||
private ResourceLocation getItemLocation(ModelResourceLocation modelResource) {
|
||||
ResourceLocation resourcelocation = new ResourceLocation(modelResource.toString().replaceAll("#.*", ""));
|
||||
@@ -102,24 +108,24 @@ public class ModelCrate implements ISmartItemModel {
|
||||
}
|
||||
|
||||
/**
|
||||
* @return Return true, when the model from the {@link ResourceLocation} a item model is
|
||||
* @return Return true, when the model a item model is
|
||||
*/
|
||||
private boolean hasItemModel(ResourceLocation location) {
|
||||
try {
|
||||
ModelBlock p_177581_1_ = loadModel(location);
|
||||
if (p_177581_1_ == null) {
|
||||
ModelBlock modelBlock = loadModel(location);
|
||||
if (modelBlock == null) {
|
||||
return false;
|
||||
} else {
|
||||
ModelBlock modelblock = p_177581_1_.getRootModel();
|
||||
return modelblock == MODEL_GENERATED || modelblock == MODEL_COMPASS || modelblock == MODEL_CLOCK;
|
||||
ModelBlock rootModelBlock = modelBlock.getRootModel();
|
||||
return rootModelBlock == MODEL_GENERATED || rootModelBlock == MODEL_COMPASS || rootModelBlock == MODEL_CLOCK;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected ModelBlock loadModel(ResourceLocation p_177594_1_) throws IOException {
|
||||
String s = p_177594_1_.getResourcePath();
|
||||
private ModelBlock loadModel(ResourceLocation location) throws IOException {
|
||||
String s = location.getResourcePath();
|
||||
|
||||
if ("builtin/generated".equals(s)) {
|
||||
return MODEL_GENERATED;
|
||||
@@ -135,10 +141,10 @@ public class ModelCrate implements ISmartItemModel {
|
||||
if (s1.equals("missing")) {
|
||||
reader = new StringReader("{ \"textures\": { \"particle\": \"missingno\", \"missingno\": \"missingno\"}, \"elements\": [ { \"from\": [ 0, 0, 0 ], \"to\": [ 16, 16, 16 ], \"faces\": { \"down\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"down\", \"texture\": \"#missingno\" }, \"up\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"up\", \"texture\": \"#missingno\" }, \"north\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"north\", \"texture\": \"#missingno\" }, \"south\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"south\", \"texture\": \"#missingno\" }, \"west\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"west\", \"texture\": \"#missingno\" }, \"east\": { \"uv\": [ 0, 0, 16, 16 ], \"cullface\": \"east\", \"texture\": \"#missingno\" } }}]}");
|
||||
} else {
|
||||
throw new FileNotFoundException(p_177594_1_.toString());
|
||||
throw new FileNotFoundException(location.toString());
|
||||
}
|
||||
} else {
|
||||
IResource iresource = Minecraft.getMinecraft().getResourceManager().getResource(this.getModelLocation(p_177594_1_));
|
||||
IResource iresource = Minecraft.getMinecraft().getResourceManager().getResource(this.getModelLocation(location));
|
||||
reader = new InputStreamReader(iresource.getInputStream(), Charsets.UTF_8);
|
||||
}
|
||||
|
||||
@@ -146,7 +152,7 @@ public class ModelCrate implements ISmartItemModel {
|
||||
|
||||
try {
|
||||
ModelBlock modelblock = ModelBlock.deserialize(reader);
|
||||
modelblock.name = p_177594_1_.toString();
|
||||
modelblock.name = location.toString();
|
||||
model = modelblock;
|
||||
} finally {
|
||||
try {
|
||||
@@ -171,8 +177,8 @@ public class ModelCrate implements ISmartItemModel {
|
||||
}
|
||||
}
|
||||
|
||||
protected ResourceLocation getModelLocation(ResourceLocation p_177580_1_) {
|
||||
return new ResourceLocation(p_177580_1_.getResourceDomain(), "models/" + p_177580_1_.getResourcePath() + ".json");
|
||||
private ResourceLocation getModelLocation(ResourceLocation resourceLocation) {
|
||||
return new ResourceLocation(resourceLocation.getResourceDomain(), "models/" + resourceLocation.getResourcePath() + ".json");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -189,54 +195,16 @@ public class ModelCrate implements ISmartItemModel {
|
||||
}
|
||||
}
|
||||
|
||||
private Function<ResourceLocation, TextureAtlasSprite> textureGetter = new DefaultTextureGetter();
|
||||
|
||||
/**
|
||||
* Bake the crate model;
|
||||
*/
|
||||
private IFlexibleBakedModel getModelCrate() {
|
||||
IFlexibleBakedModel flexModel;
|
||||
IBakedModel model = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(new ItemStack(PluginStorage.items.crate, 1, 1));
|
||||
if (model == null) {
|
||||
return null;
|
||||
} else if (model instanceof IFlexibleBakedModel) {
|
||||
flexModel = (IFlexibleBakedModel) model;
|
||||
} else {
|
||||
flexModel = new IFlexibleBakedModel.Wrapper(model, DefaultVertexFormats.ITEM);
|
||||
}
|
||||
IFlexibleBakedModel flexModel = getModel(new ItemStack(PluginStorage.items.crate, 1, 1));
|
||||
return crateModel.bake(crateModel.getDefaultState(), flexModel.getFormat(), textureGetter);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getFaceQuads(EnumFacing facing) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getGeneralQuads() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAmbientOcclusion() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGui3d() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isBuiltInRenderer() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getParticleTexture() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemCameraTransforms getItemCameraTransforms() {
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Bake the crated model
|
||||
*/
|
||||
@@ -251,15 +219,13 @@ public class ModelCrate implements ISmartItemModel {
|
||||
for (BakedQuad quad : baseBaked.getGeneralQuads()) {
|
||||
ObfuscationReflectionHelper.setPrivateValue(BakedQuad.class, quad, 100, 1);
|
||||
}
|
||||
crates.put(crateUID, new MultiModel.Baked(baseBaked, bakeModels(crated)));
|
||||
crates.put(crateUID, new MultiModel.Baked(baseBaked, bakeContentModels(crated)));
|
||||
}
|
||||
return crates.get(crateUID);
|
||||
}
|
||||
|
||||
private static class CrateTextureGetter implements Function<ResourceLocation, TextureAtlasSprite> {
|
||||
@Override
|
||||
public TextureAtlasSprite apply(ResourceLocation location) {
|
||||
return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGui3d() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@ import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
|
||||
import forestry.api.core.BiomeHelper;
|
||||
import forestry.api.core.IErrorLogic;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.errors.EnumErrorCode;
|
||||
|
||||
@@ -16,9 +16,6 @@ import java.io.IOException;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.biome.BiomeGenBase;
|
||||
|
||||
import forestry.api.core.BiomeHelper;
|
||||
import forestry.api.core.INbtReadable;
|
||||
import forestry.api.core.INbtWritable;
|
||||
import forestry.core.network.DataInputStreamForestry;
|
||||
|
||||
@@ -153,7 +153,7 @@ public class PluginLepidopterology extends BlankForestryPlugin {
|
||||
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void textureHook(TextureStitchEvent.Pre event) {
|
||||
public void registerSprites(TextureStitchEvent.Pre event) {
|
||||
ItemButterflyGE.registerSprites();
|
||||
}
|
||||
}
|
||||
@@ -17,6 +17,7 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
@@ -25,7 +26,6 @@ import com.mojang.authlib.GameProfile;
|
||||
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
|
||||
import forestry.api.core.IModelProvider;
|
||||
import forestry.api.core.ISpriteProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IClassification;
|
||||
@@ -36,11 +36,13 @@ import forestry.api.lepidopterology.EnumFlutterType;
|
||||
import forestry.api.lepidopterology.IAlleleButterflySpecies;
|
||||
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
|
||||
import forestry.api.lepidopterology.IButterflyRoot;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.genetics.alleles.AlleleSpecies;
|
||||
import forestry.lepidopterology.render.TextureAtlasButterfly;
|
||||
|
||||
public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpecies, IAlleleButterflySpeciesBuilder, ISpriteProvider {
|
||||
private final String texture;
|
||||
private final String modID;
|
||||
private final Color serumColour;
|
||||
private float rarity = 0.1f;
|
||||
private float flightDistance = 5.0f;
|
||||
@@ -51,9 +53,11 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt
|
||||
private final Map<ItemStack, Float> butterflyLoot = new HashMap<>();
|
||||
private final Map<ItemStack, Float> caterpillarLoot = new HashMap<>();
|
||||
|
||||
public AlleleButterflySpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) {
|
||||
public AlleleButterflySpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) {
|
||||
super(uid, unlocalizedName, authority, unlocalizedDescription, isDominant, branch, binomial);
|
||||
this.serumColour = serumColour;
|
||||
|
||||
this.modID = modID;
|
||||
this.texture = texturePath;
|
||||
}
|
||||
|
||||
@@ -98,7 +102,12 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt
|
||||
|
||||
@Override
|
||||
public String getEntityTexture() {
|
||||
return texture;
|
||||
return getModID() + ":" + Constants.TEXTURE_PATH_ENTITIES + "/" + texture + ".png";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemTexture() {
|
||||
return getModID() + ":" + "items/" + texture;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -185,11 +194,6 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt
|
||||
return 0xffffff;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IModelProvider getModelProvider() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ISpriteProvider getSpriteProvider() {
|
||||
return this;
|
||||
@@ -197,12 +201,18 @@ public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButt
|
||||
|
||||
@Override
|
||||
public void registerSprites() {
|
||||
String spriteName = texture.replace(".png", "").replace("textures/", "").replace("entity", "items");
|
||||
Minecraft.getMinecraft().getTextureMapBlocks().setTextureEntry(spriteName, new TextureAtlasButterfly(spriteName));
|
||||
String spriteName = getItemTexture();
|
||||
TextureMap textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
|
||||
textureMap.setTextureEntry(spriteName, new TextureAtlasButterfly(spriteName));
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getSprite(short texUID) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModID() {
|
||||
return modID;
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,6 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies;
|
||||
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
|
||||
import forestry.api.lepidopterology.IButterfly;
|
||||
import forestry.api.lepidopterology.IButterflyGenome;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.genetics.alleles.AlleleHelper;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
|
||||
@@ -313,9 +312,9 @@ public enum ButterflyDefinition implements IButterflyDefinition {
|
||||
String unlocalizedName = "for.butterflies.species." + parent.getUID().substring((parent.getLevel().name().toLowerCase(Locale.ENGLISH)).length() + 1) + '.' + speciesName;
|
||||
String unlocalizedDescription = "for.description." + uid;
|
||||
|
||||
String texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png";
|
||||
String texture = "butterflies/" + uid;
|
||||
|
||||
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
|
||||
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, "forestry", texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
|
||||
speciesBuilder.setRarity(rarity);
|
||||
setSpeciesProperties(speciesBuilder);
|
||||
this.species = speciesBuilder.build();
|
||||
|
||||
@@ -18,7 +18,7 @@ import forestry.api.lepidopterology.IButterflyFactory;
|
||||
|
||||
public class ButterflyFactory implements IButterflyFactory {
|
||||
@Override
|
||||
public IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) {
|
||||
return new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, texturePath, isDominant, branch, binomial, serumColour);
|
||||
public IAlleleButterflySpeciesBuilder createSpecies(String uid, String unlocalizedName, String authority, String unlocalizedDescription, String modID, String texturePath, boolean isDominant, IClassification branch, String binomial, Color serumColour) {
|
||||
return new AlleleButterflySpecies(uid, unlocalizedName, authority, unlocalizedDescription, modID, texturePath, isDominant, branch, binomial, serumColour);
|
||||
}
|
||||
}
|
||||
@@ -25,7 +25,6 @@ import forestry.api.lepidopterology.IAlleleButterflySpecies;
|
||||
import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder;
|
||||
import forestry.api.lepidopterology.IButterfly;
|
||||
import forestry.api.lepidopterology.IButterflyGenome;
|
||||
import forestry.core.config.Constants;
|
||||
import forestry.core.genetics.alleles.AlleleHelper;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
|
||||
@@ -57,9 +56,9 @@ public enum MothDefinition implements IButterflyDefinition {
|
||||
String unlocalizedName = "for.butterflies.species." + parent.getUID().substring((parent.getLevel().name().toLowerCase(Locale.ENGLISH)).length() + 1) + '.' + speciesName;
|
||||
String unlocalizedDescription = "for.description." + uid;
|
||||
|
||||
String texture = "forestry:" + Constants.TEXTURE_PATH_ENTITIES + "/butterflies/" + uid + ".png";
|
||||
String texture = "butterflies/" + uid;
|
||||
|
||||
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
|
||||
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, "forestry", texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
|
||||
speciesBuilder.setRarity(rarity);
|
||||
speciesBuilder.setNocturnal();
|
||||
setSpeciesProperties(speciesBuilder);
|
||||
|
||||
@@ -57,16 +57,6 @@ public class ItemButterflyGE extends ItemGE {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDefaultPrimaryColour() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getDefaultSecondaryColour() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IButterfly getIndividual(ItemStack itemstack) {
|
||||
return ButterflyManager.butterflyRoot.getMember(itemstack);
|
||||
@@ -146,7 +136,8 @@ public class ItemButterflyGE extends ItemGE {
|
||||
return false;
|
||||
}
|
||||
|
||||
/* ICONS FOR SERUMS */
|
||||
/* MODELS */
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public int getColorFromItemStack(ItemStack itemstack, int renderPass) {
|
||||
if (!itemstack.hasTagCompound()) {
|
||||
@@ -156,6 +147,7 @@ public class ItemButterflyGE extends ItemGE {
|
||||
return getColourFromSpecies(AlleleManager.alleleRegistry.getIndividual(itemstack).getGenome().getPrimary(), renderPass);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public int getColourFromSpecies(IAlleleSpecies species, int renderPass) {
|
||||
if (species != null) {
|
||||
@@ -165,8 +157,8 @@ public class ItemButterflyGE extends ItemGE {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/* MODELS */
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
switch (this.type) {
|
||||
@@ -218,6 +210,9 @@ public class ItemButterflyGE extends ItemGE {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Register butterfly item sprites
|
||||
*/
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void registerSprites() {
|
||||
for (IAllele allele : AlleleManager.alleleRegistry.getRegisteredAlleles().values()) {
|
||||
|
||||
@@ -14,65 +14,28 @@ import com.google.common.base.Function;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
|
||||
import net.minecraft.client.resources.model.IBakedModel;
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
import net.minecraft.client.resources.model.ModelRotation;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import net.minecraftforge.client.model.IRetexturableModel;
|
||||
import net.minecraftforge.client.model.ISmartItemModel;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import forestry.api.lepidopterology.ButterflyManager;
|
||||
import forestry.api.lepidopterology.IButterfly;
|
||||
import forestry.core.models.BlankItemModel;
|
||||
import forestry.core.models.DefaultTextureGetter;
|
||||
|
||||
public class ModelButterflyItem implements ISmartItemModel {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class ModelButterflyItem extends BlankItemModel {
|
||||
|
||||
public IRetexturableModel modelButterfly;
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getGeneralQuads() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAmbientOcclusion() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isGui3d() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isBuiltInRenderer() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TextureAtlasSprite getParticleTexture() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemCameraTransforms getItemCameraTransforms() {
|
||||
return null;
|
||||
}
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IRetexturableModel modelButterfly;
|
||||
|
||||
@Override
|
||||
public IBakedModel handleItemState(ItemStack item) {
|
||||
@@ -92,19 +55,13 @@ public class ModelButterflyItem implements ISmartItemModel {
|
||||
}
|
||||
return bakeModel(butterfly);
|
||||
}
|
||||
|
||||
private Function<ResourceLocation, TextureAtlasSprite> textureGetter = new DefaultTextureGetter();
|
||||
|
||||
public IBakedModel bakeModel(IButterfly butterfly) {
|
||||
Function<ResourceLocation, TextureAtlasSprite> textureGetter = new ButterflyTextureGetter();
|
||||
private IBakedModel bakeModel(IButterfly butterfly) {
|
||||
ImmutableMap.Builder<String, String> textures = ImmutableMap.builder();
|
||||
textures.put("butterfly", butterfly.getGenome().getSecondary().getEntityTexture().replace(".png", "").replace("textures/", "").replace("entity", "items"));
|
||||
textures.put("butterfly", butterfly.getGenome().getSecondary().getItemTexture());
|
||||
modelButterfly = (IRetexturableModel) modelButterfly.retexture(textures.build());
|
||||
return modelButterfly.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, textureGetter);
|
||||
}
|
||||
|
||||
private static class ButterflyTextureGetter implements Function<ResourceLocation, TextureAtlasSprite> {
|
||||
@Override
|
||||
public TextureAtlasSprite apply(ResourceLocation location) {
|
||||
return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,6 @@ package forestry.storage;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
@@ -36,8 +35,6 @@ import net.minecraft.block.BlockTrapDoor;
|
||||
import net.minecraft.block.BlockWall;
|
||||
import net.minecraft.block.BlockWorkbench;
|
||||
import net.minecraft.block.IGrowable;
|
||||
import net.minecraft.client.resources.model.ModelBakery;
|
||||
import net.minecraft.client.resources.model.ModelResourceLocation;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -45,13 +42,11 @@ import net.minecraft.item.ItemDoor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import net.minecraftforge.client.event.ModelBakeEvent;
|
||||
import net.minecraftforge.client.model.ModelLoaderRegistry;
|
||||
import net.minecraftforge.common.IPlantable;
|
||||
import net.minecraftforge.common.IShearable;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Property;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
|
||||
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
@@ -542,14 +537,6 @@ public class PluginStorage extends BlankForestryPlugin {
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void onBakeModel(ModelBakeEvent event) {
|
||||
try {
|
||||
ModelCrate.crateModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("forestry:crate-filled", "inventory"));
|
||||
ModelCrate.MODEL_GENERATED = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 14);
|
||||
ModelCrate.MODEL_COMPASS = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 15);
|
||||
ModelCrate.MODEL_CLOCK = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, event.modelLoader, 16);
|
||||
ModelCrate.loader = event.modelLoader;
|
||||
} catch (IOException e) {
|
||||
Log.error("Failed to bake model.", e);
|
||||
}
|
||||
ModelCrate.initModel(event);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user