From 1de504865302ecb98e6ce014be91a890a511ec46 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 7 Feb 2016 11:47:25 -0600 Subject: [PATCH] More lexicon model work --- .../botania/client/model/LexiconModel.java | 89 +++++++++++++------ 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index 49b11fdcd..56d6be0f0 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -6,77 +6,110 @@ 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.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.Attributes; import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.animation.Animation; import net.minecraftforge.client.model.animation.Event; import net.minecraftforge.common.model.animation.IAnimationStateMachine; +import net.minecraftforge.fml.common.FMLLog; import org.apache.commons.lang3.tuple.Pair; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.handler.ConfigHandler; import javax.vecmath.Matrix4f; +import java.io.IOException; import java.util.List; +import java.util.Map; /** * This class handles choosing between the lexicon's default model and the special first person one */ public class LexiconModel implements IPerspectiveAwareModel { - private IFlexibleBakedModel normalModel; - private IFlexibleBakedModel specialModel; - private IAnimationStateMachine asm; + private static final Map missingTransforms; - private IFlexibleBakedModel getNormalModel() { - if (normalModel == null) { - normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() - .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + static { + ImmutableMap.Builder builder = ImmutableMap.builder(); + for (ItemCameraTransforms.TransformType t :ItemCameraTransforms.TransformType.values()) { + builder.put(t, TRSRTransformation.identity()); } - return normalModel; + missingTransforms = builder.build(); } - private IFlexibleBakedModel getSpecialModel() { - if (specialModel == null) { - specialModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() - .getRenderItem().getItemModelMesher().getModelManager() - .getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + private IFlexibleBakedModel normalModel; + private Map normalModelTransforms; + + private IModel specialModel; + private Map specialModelTransforms; + + private IAnimationStateMachine asm; + + private boolean hasInit = false; + + private void initModels() { + if(hasInit) + return; + + normalModel = new IFlexibleBakedModel.Wrapper(Minecraft.getMinecraft() + .getRenderItem().getItemModelMesher().getModelManager() + .getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")), Attributes.DEFAULT_BAKED_FORMAT); + + asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); + + try { + normalModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_default", "inventory")).getDefaultState()); + specialModel = ModelLoaderRegistry.getModel(new ModelResourceLocation("botania:lexicon_firstperson", "inventory")); + specialModelTransforms = IPerspectiveAwareModel.MapWrapper.getTransforms(specialModel.getDefaultState()); + } catch (IOException ex) { + FMLLog.warning("[Botania] Lexicon model couldn't be loaded"); + if(normalModelTransforms == null) + normalModelTransforms = missingTransforms; + if(specialModel == null) + specialModel = ModelLoaderRegistry.getMissingModel(); + if(specialModelTransforms == null) + specialModelTransforms = missingTransforms; } - if (asm == null) { - asm = Animation.INSTANCE.load(new ResourceLocation("botania", "asms/item/lexicon_firstperson.json"), ImmutableMap.of()); - } - return specialModel; + hasInit = true; } @SuppressWarnings("deprecation") @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + initModels(); if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) { - IFlexibleBakedModel model = getSpecialModel(); + System.out.println("m8"); float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F; Pair> animate = asm.apply(time); - return Pair.of(model, new TRSRTransformation(model.getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + IFlexibleBakedModel baked = specialModel.bake(animate.getLeft(), Attributes.DEFAULT_BAKED_FORMAT, ModelLoader.defaultTextureGetter()); + + TRSRTransformation transform = specialModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : specialModelTransforms.get(cameraTransformType); + return Pair.of(baked, transform.getMatrix()); } else { - return Pair.of(getNormalModel(), new TRSRTransformation(getNormalModel().getItemCameraTransforms().getTransform(cameraTransformType)).getMatrix()); + TRSRTransformation transform = normalModelTransforms.get(cameraTransformType) == null ? TRSRTransformation.identity() : normalModelTransforms.get(cameraTransformType); + return Pair.of(normalModel, transform.getMatrix()); } } @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } - @Override public List getFaceQuads(EnumFacing e) { return getNormalModel().getFaceQuads(e); } - @Override public List getGeneralQuads() { return getNormalModel().getGeneralQuads(); } - @Override public boolean isAmbientOcclusion() { return getNormalModel().isAmbientOcclusion(); } - @Override public boolean isGui3d() { return getNormalModel().isGui3d(); } - @Override public boolean isBuiltInRenderer() { return getNormalModel().isBuiltInRenderer(); } - @Override public TextureAtlasSprite getParticleTexture() { return getNormalModel().getParticleTexture(); } + @Override public List getFaceQuads(EnumFacing e) { initModels(); return normalModel.getFaceQuads(e); } + @Override public List getGeneralQuads() { initModels(); return normalModel.getGeneralQuads(); } + @Override public boolean isAmbientOcclusion() { initModels(); return normalModel.isAmbientOcclusion(); } + @Override public boolean isGui3d() { initModels(); return normalModel.isGui3d(); } + @Override public boolean isBuiltInRenderer() { initModels(); return normalModel.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { initModels(); return normalModel.getParticleTexture(); } @SuppressWarnings("deprecation") - @Override public ItemCameraTransforms getItemCameraTransforms() { return getNormalModel().getItemCameraTransforms(); } + @Override public ItemCameraTransforms getItemCameraTransforms() { initModels(); return normalModel.getItemCameraTransforms(); } }