Spreader item models. Closes #4. Also fix third person pool model and restore old lexicon model until I'm ready to tackle it

This commit is contained in:
Vincent Lee committed 2016-03-06 14:19:28 -06:00
1 parent 93f869a8f5
commit 8f46355769
19 files changed
+129 -248

No files matched your search

@@ -27,10 +27,8 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import vazkii.botania.client.core.helper.IconHelper;
import vazkii.botania.client.model.FloatingFlowerModel;
import vazkii.botania.client.model.LexiconModel;
import vazkii.botania.client.model.PlatformModel;
import vazkii.botania.client.model.PylonItemModel;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.integration.buildcraft.TriggerManaLevel;
import vazkii.botania.common.item.ItemSparkUpgrade;
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
@@ -99,9 +97,6 @@ public class MiscellaneousIcons {
// Platforms
evt.modelRegistry.putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel());
// Lexicon
evt.modelRegistry.putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel());
}
@SubscribeEvent
@@ -472,10 +472,6 @@ public final class ModelHandler {
registerItemModel(pestleAndMortar);
registerItemModel(blackLotus);
registerItemModel(blackLotus, 1);
ModelLoader.registerItemVariants(lexicon,
new ModelResourceLocation("botania:lexicon_default", "inventory"),
new ModelResourceLocation("botania:lexicon_firstperson", "inventory"));
registerItemModel(lexicon);
registerItemModel(manasteelHelm);
@@ -1,115 +0,0 @@
package vazkii.botania.client.model;
import com.google.common.collect.ImmutableMap;
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.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 static final Map<ItemCameraTransforms.TransformType, TRSRTransformation> missingTransforms;
static {
ImmutableMap.Builder<ItemCameraTransforms.TransformType, TRSRTransformation> builder = ImmutableMap.builder();
for (ItemCameraTransforms.TransformType t :ItemCameraTransforms.TransformType.values()) {
builder.put(t, TRSRTransformation.identity());
}
missingTransforms = builder.build();
}
private IFlexibleBakedModel normalModel;
private Map<ItemCameraTransforms.TransformType, TRSRTransformation> normalModelTransforms;
private IModel specialModel;
private Map<ItemCameraTransforms.TransformType, TRSRTransformation> 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;
}
hasInit = true;
}
@SuppressWarnings("deprecation")
@Override
public Pair<? extends IFlexibleBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
initModels();
if (ConfigHandler.lexicon3dModel && cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON) {
//System.out.println("m8");
float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) / 20F;
Pair<IModelState, Iterable<Event>> animate = asm.apply(time);
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 {
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<BakedQuad> getFaceQuads(EnumFacing e) { initModels(); return normalModel.getFaceQuads(e); }
@Override public List<BakedQuad> 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() { initModels(); return normalModel.getItemCameraTransforms(); }
}
@@ -10,6 +10,7 @@
*/
package vazkii.botania.common.block.mana;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
@@ -33,6 +34,8 @@ import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.lexicon.ILexiconable;
@@ -41,6 +44,7 @@ import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.PoolVariant;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.achievement.ICraftAchievement;
import vazkii.botania.common.achievement.ModAchievements;
import vazkii.botania.common.block.BlockMod;
@@ -181,6 +185,17 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
return 2;
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderColor(IBlockState state) {
if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) {
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode();
} else {
return 16777215;
}
}
@Override
public boolean hasComparatorInputOverride() {
return true;
@@ -10,6 +10,7 @@
*/
package vazkii.botania.common.block.mana;
import java.awt.*;
import java.util.List;
import java.util.Random;
@@ -33,6 +34,8 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.mana.ILens;
@@ -41,9 +44,11 @@ import vazkii.botania.api.state.enums.SpreaderVariant;
import vazkii.botania.api.wand.IWandHUD;
import vazkii.botania.api.wand.IWandable;
import vazkii.botania.api.wand.IWireframeAABBProvider;
import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.common.block.BlockMod;
import vazkii.botania.common.block.tile.mana.TileSpreader;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockWithMetaNameAndColor;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibBlockNames;
@@ -87,7 +92,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
@Override
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
GameRegistry.registerBlock(this, ItemBlockWithMetaNameAndColor.class, par1Str);
return super.setUnlocalizedName(par1Str);
}
@@ -139,6 +144,15 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
return false;
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderColor(IBlockState state) {
if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA)
return super.getRenderColor(state);
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode();
}
@Override
public int getRenderType() {
return 2;
@@ -10,19 +10,14 @@
*/
package vazkii.botania.common.item.block;
import java.awt.*;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.state.enums.PoolVariant;
import vazkii.botania.client.core.handler.ClientTickHandler;
public class ItemBlockPool extends ItemBlockWithMetadataAndName {
public class ItemBlockPool extends ItemBlockWithMetaNameAndColor {
public ItemBlockPool(Block par2Block) {
super(par2Block);
@@ -35,15 +30,4 @@ public class ItemBlockPool extends ItemBlockWithMetadataAndName {
par3List.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i));
}
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int renderPass) {
if (stack.getItemDamage() == PoolVariant.FABULOUS.ordinal() && renderPass == 0) {
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode();
} else {
return 16777215;
}
}
}