Fix #1919 Butterfly Model throws NullPointerException

This commit is contained in:
Nedelosk committed 2018-01-06 14:39:43 +01:00
1 parent 05070982dc
commit 3b547c1b87
2 files changed
+82 -16

No files matched your search

@@ -136,6 +136,32 @@ public abstract class Genome implements IGenome {
return (IAlleleSpecies) activeAllele;
}
/**
* Quickly gets the species without loading the whole genome.
*/
@Nullable
public static IAllele getSpeciesDirectly(ItemStack itemStack, IChromosomeType chromosomeType, boolean active) {
NBTTagCompound nbtTagCompound = itemStack.getTagCompound();
if (nbtTagCompound == null) {
return null;
}
NBTTagCompound genomeNBT = nbtTagCompound.getCompoundTag("Genome");
if (genomeNBT.hasNoTags()) {
return null;
}
NBTTagList chromosomesNBT = genomeNBT.getTagList("Chromosomes", 10);
if (chromosomesNBT.hasNoTags()) {
return null;
}
NBTTagCompound chromosomeNBT = chromosomesNBT.getCompoundTagAt(0);
Chromosome chromosome = Chromosome.create(null, null, chromosomeType, chromosomeNBT);
return active ? chromosome.getActiveAllele() : chromosome.getInactiveAllele();
}
private static IChromosome getChromosome(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) {
NBTTagCompound nbtTagCompound = itemStack.getTagCompound();
if (nbtTagCompound == null) {
@@ -186,6 +212,24 @@ public abstract class Genome implements IGenome {
return chromosomes;
}
public static IAllele getAllele(ItemStack itemStack, IChromosomeType type, boolean active){
IAllele allele = getSpeciesDirectly(itemStack, type, active);
if(allele == null){
IChromosome chromosome = getChromosome(itemStack, type, type.getSpeciesRoot());
allele = active ? chromosome.getActiveAllele() : chromosome.getInactiveAllele();
}
return allele;
}
@Nullable
public static <A extends IAllele> A getAllele(ItemStack itemStack, IChromosomeType type, boolean active, Class<? extends A> alleleClass){
IAllele allele = getAllele(itemStack, type, active);
if(alleleClass.isInstance(allele)){
return alleleClass.cast(allele);
}
return null;
}
protected static IAllele getActiveAllele(ItemStack itemStack, IChromosomeType chromosomeType, ISpeciesRoot speciesRoot) {
IChromosome chromosome = getChromosome(itemStack, chromosomeType, speciesRoot);
return chromosome.getActiveAllele();
@@ -16,10 +16,12 @@ import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableMap;
import javax.annotation.Nullable;
import javax.vecmath.Vector3f;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.block.model.ModelRotation;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -31,17 +33,24 @@ import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.ModelStateComposition;
import net.minecraftforge.client.model.PerspectiveMapWrapper;
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.lepidopterology.ButterflyManager;
import forestry.api.genetics.IAlleleFloat;
import forestry.api.lepidopterology.EnumButterflyChromosome;
import forestry.api.lepidopterology.IAlleleButterflySpecies;
import forestry.api.lepidopterology.IButterfly;
import forestry.core.config.Constants;
import forestry.core.genetics.Genome;
import forestry.core.models.BlankModel;
import forestry.core.models.DefaultTextureGetter;
import forestry.core.models.TRSRBakedModel;
import forestry.core.utils.ModelUtil;
@SideOnly(Side.CLIENT)
public class ModelButterflyItem extends BlankModel {
@@ -60,8 +69,8 @@ public class ModelButterflyItem extends BlankModel {
return new ButterflyItemOverrideList();
}
private IBakedModel bakeModel(IButterfly butterfly) {
ImmutableMap<String, String> textures = ImmutableMap.of("butterfly", butterfly.getGenome().getPrimary().getItemTexture());
private IBakedModel bakeModel(IAlleleButterflySpecies species, float size) {
ImmutableMap<String, String> textures = ImmutableMap.of("butterfly", species.getItemTexture());
if (modelButterfly == null) {
try {
@@ -69,13 +78,25 @@ public class ModelButterflyItem extends BlankModel {
} catch (Exception e) {
throw new RuntimeException(e);
}
if (modelButterfly == null) {
throw new IllegalArgumentException("Could not bake butterfly model");
}
}
IModel retexturedModel = modelButterfly.retexture(textures);
IBakedModel bakedModel = retexturedModel.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, DefaultTextureGetter.INSTANCE);
return new TRSRBakedModel(bakedModel, -0.03125F, 0.25F - butterfly.getSize() * 0.37F, -0.03125F, butterfly.getSize() * 1.5F);
IModel model = modelButterfly.retexture(textures);
IBakedModel bakedModel = model.bake(ModelRotation.X0_Y0, DefaultVertexFormats.ITEM, DefaultTextureGetter.INSTANCE);
float scale = 1F / 16F;
IModelState state = ModelUtil.loadModelState(new ResourceLocation(Constants.MOD_ID, "models/item/butterfly_ge"));
state = new ModelStateComposition(state, new SimpleModelState(getTransformations(size)));
return new PerspectiveMapWrapper(new TRSRBakedModel(bakedModel, -0.03125F, 0.25F - size * 0.37F, -0.03125F + size * scale, size * 1.4F), state);
}
private static ImmutableMap<ItemCameraTransforms.TransformType, TRSRTransformation> getTransformations(float size) {
float scale = 1F / 16F;
ImmutableMap.Builder<ItemCameraTransforms.TransformType, TRSRTransformation> builder = ImmutableMap.builder();
builder.put(ItemCameraTransforms.TransformType.FIXED,
new TRSRTransformation(new Vector3f(scale * 0.5F, scale - (size / 0.75F) * scale, scale * 1.25F), null, null, null));
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND,
new TRSRTransformation(new Vector3f(0, scale - (size / 1F) * scale, 0), null, null, null));
builder.put(ItemCameraTransforms.TransformType.THIRD_PERSON_LEFT_HAND,
new TRSRTransformation(new Vector3f(0, scale - (size / 1F) * scale, 0), null, null, null));
return builder.build();
}
private class ButterflyItemOverrideList extends ItemOverrideList {
@@ -85,13 +106,14 @@ public class ModelButterflyItem extends BlankModel {
@Override
public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) {
IButterfly butterfly = ButterflyManager.butterflyRoot.getMember(stack);
Preconditions.checkNotNull(butterfly);
IAlleleButterflySpecies primary = butterfly.getGenome().getPrimary();
IBakedModel bakedModel = cache.getIfPresent(primary);
IAlleleButterflySpecies species = Genome.getAllele(stack, EnumButterflyChromosome.SPECIES, true, IAlleleButterflySpecies.class);
IAlleleFloat size = Genome.getAllele(stack, EnumButterflyChromosome.SIZE, true, IAlleleFloat.class);
Preconditions.checkNotNull(species);
Preconditions.checkNotNull(size);
IBakedModel bakedModel = cache.getIfPresent(species);
if (bakedModel == null) {
bakedModel = bakeModel(butterfly);
cache.put(primary, bakedModel);
bakedModel = bakeModel(species, size.getValue());
cache.put(species, bakedModel);
}
return bakedModel;
}