mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
~80 errors remaining. Need to properly add offhand support for most items
This commit is contained in:
1 parent
a89b8f666c
commit
79af86daae
40 files changed
+586
-436
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package mekanism.client.render.obj;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.vecmath.Matrix4f;
|
||||
@@ -12,13 +13,18 @@ import mekanism.common.multipart.PartGlowPanel;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.client.renderer.block.model.BakedQuad;
|
||||
import net.minecraft.client.renderer.block.model.IBakedModel;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
|
||||
import net.minecraft.client.renderer.block.model.ItemOverrideList;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.vertex.VertexFormat;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.model.IPerspectiveAwareModel;
|
||||
import net.minecraftforge.client.model.ModelLoader;
|
||||
import net.minecraftforge.client.model.obj.OBJModel;
|
||||
@@ -27,19 +33,22 @@ import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel;
|
||||
import net.minecraftforge.common.model.IModelState;
|
||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
public class GlowPanelModel extends OBJBakedModelBase implements ISmartMultipartModel
|
||||
public class GlowPanelModel extends OBJBakedModelBase
|
||||
{
|
||||
private static Map<Integer, GlowPanelModel> glowPanelCache = new HashMap<Integer, GlowPanelModel>();
|
||||
private static Map<Integer, List<BakedQuad>> glowPanelCache = new HashMap<Integer, List<BakedQuad>>();
|
||||
private static Map<Integer, GlowPanelModel> glowPanelItemCache = new HashMap<Integer, GlowPanelModel>();
|
||||
|
||||
private IBlockState tempState;
|
||||
private ItemStack tempStack;
|
||||
|
||||
private GlowPanelOverride override = new GlowPanelOverride();
|
||||
|
||||
public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap<String, TextureAtlasSprite> textures, HashMap<TransformType, Matrix4f> transform)
|
||||
{
|
||||
super(base, model, state, format, textures, transform);
|
||||
@@ -66,59 +75,78 @@ public class GlowPanelModel extends OBJBakedModelBase implements ISmartMultipart
|
||||
return EnumColor.WHITE;
|
||||
}
|
||||
|
||||
private class GlowPanelOverride extends ItemOverrideList
|
||||
{
|
||||
public GlowPanelOverride()
|
||||
{
|
||||
super(Lists.newArrayList());
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity)
|
||||
{
|
||||
if(glowPanelItemCache.containsKey(stack.getItemDamage()))
|
||||
{
|
||||
return glowPanelItemCache.get(stack.getItemDamage());
|
||||
}
|
||||
|
||||
ImmutableMap.Builder<String, TextureAtlasSprite> builder = ImmutableMap.builder();
|
||||
builder.put(ModelLoader.White.LOCATION.toString(), ModelLoader.White.INSTANCE);
|
||||
TextureAtlasSprite missing = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(new ResourceLocation("missingno").toString());
|
||||
|
||||
for(String s : getModel().getMatLib().getMaterialNames())
|
||||
{
|
||||
TextureAtlasSprite sprite = null;
|
||||
|
||||
if(sprite == null)
|
||||
{
|
||||
sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString());
|
||||
}
|
||||
|
||||
if(sprite == null)
|
||||
{
|
||||
sprite = missing;
|
||||
}
|
||||
|
||||
builder.put(s, sprite);
|
||||
}
|
||||
|
||||
builder.put("missingno", missing);
|
||||
GlowPanelModel bakedModel = new GlowPanelModel(baseModel, getModel(), getState(), vertexFormat, builder.build(), transformationMap);
|
||||
bakedModel.tempStack = stack;
|
||||
glowPanelItemCache.put(stack.getItemDamage(), bakedModel);
|
||||
|
||||
return bakedModel;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public OBJBakedModel handlePartState(IBlockState state)
|
||||
public ItemOverrideList getOverrides()
|
||||
{
|
||||
int hash = PartGlowPanel.hash((IExtendedBlockState)state);
|
||||
return override;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<BakedQuad> getQuads(IBlockState state, EnumFacing side, long rand)
|
||||
{
|
||||
if(side != null)
|
||||
{
|
||||
return ImmutableList.of();
|
||||
}
|
||||
|
||||
int hash = PartGlowPanel.hash((IExtendedBlockState)state);
|
||||
EnumColor color = ((IExtendedBlockState)state).getValue(ColorProperty.INSTANCE).color;
|
||||
|
||||
if(!glowPanelCache.containsKey(hash))
|
||||
{
|
||||
GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), textureMap, transformationMap);
|
||||
GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), vertexFormat, textureMap, transformationMap);
|
||||
model.tempState = state;
|
||||
glowPanelCache.put(hash, model);
|
||||
glowPanelCache.put(hash, model.getQuads(state, side, rand));
|
||||
}
|
||||
|
||||
return glowPanelCache.get(hash);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBakedModel handleItemState(ItemStack stack)
|
||||
{
|
||||
if(glowPanelItemCache.containsKey(stack.getItemDamage()))
|
||||
{
|
||||
return glowPanelItemCache.get(stack.getItemDamage());
|
||||
}
|
||||
|
||||
ImmutableMap.Builder<String, TextureAtlasSprite> builder = ImmutableMap.builder();
|
||||
builder.put(ModelLoader.White.LOCATION.toString(), ModelLoader.White.INSTANCE);
|
||||
TextureAtlasSprite missing = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(new ResourceLocation("missingno").toString());
|
||||
|
||||
for(String s : getModel().getMatLib().getMaterialNames())
|
||||
{
|
||||
TextureAtlasSprite sprite = null;
|
||||
|
||||
if(sprite == null)
|
||||
{
|
||||
sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString());
|
||||
}
|
||||
|
||||
if(sprite == null)
|
||||
{
|
||||
sprite = missing;
|
||||
}
|
||||
|
||||
builder.put(s, sprite);
|
||||
}
|
||||
|
||||
builder.put("missingno", missing);
|
||||
GlowPanelModel bakedModel = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), builder.build(), transformationMap);
|
||||
bakedModel.tempStack = stack;
|
||||
glowPanelItemCache.put(stack.getItemDamage(), bakedModel);
|
||||
|
||||
return bakedModel;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float[] getOverrideColor(Face f, String groupName)
|
||||
{
|
||||
@@ -149,15 +177,8 @@ public class GlowPanelModel extends OBJBakedModelBase implements ISmartMultipart
|
||||
else if(cameraTransformType == TransformType.THIRD_PERSON_RIGHT_HAND)
|
||||
{
|
||||
GlStateManager.translate(0.0F, -0.1F, 0.0F);
|
||||
|
||||
if(thirdPersonTransform == null)
|
||||
{
|
||||
thirdPersonTransform = ImmutablePair.of(this, CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX);
|
||||
}
|
||||
|
||||
return thirdPersonTransform;
|
||||
}
|
||||
|
||||
return Pair.of(this, null);
|
||||
return Pair.of(this, CTMModelFactory.transforms.get(cameraTransformType).getMatrix());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user