From 6eddd30478cd89436b903f6710c3b4227b4bb10b Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 13:18:54 -0400 Subject: [PATCH] Work on transmitter models, not working yet --- .../client/render/obj/GlowPanelModel.java | 202 +------------ .../client/render/obj/MekanismOBJLoader.java | 19 +- .../client/render/obj/MekanismOBJModel.java | 7 +- .../client/render/obj/OBJBakedModelBase.java | 281 ++++++++++++++++++ .../client/render/obj/TransmitterModel.java | 63 ++-- .../transmitter/TransmitterRenderState.java | 6 - .../common/multipart/MultipartMekanism.java | 10 +- .../blockstates/diversion_transporter.json | 2 +- .../logistical_transporter_advanced.json | 2 +- .../logistical_transporter_basic.json | 2 +- .../logistical_transporter_elite.json | 2 +- .../logistical_transporter_ultimate.json | 2 +- .../blockstates/mechanical_pipe_advanced.json | 2 +- .../blockstates/mechanical_pipe_basic.json | 2 +- .../blockstates/mechanical_pipe_elite.json | 2 +- .../blockstates/mechanical_pipe_ultimate.json | 2 +- .../pressurized_tube_advanced.json | 2 +- .../blockstates/pressurized_tube_basic.json | 2 +- .../blockstates/pressurized_tube_elite.json | 2 +- .../pressurized_tube_ultimate.json | 2 +- .../blockstates/restrictive_transporter.json | 2 +- .../thermodynamic_conductor_advanced.json | 2 +- .../thermodynamic_conductor_basic.json | 2 +- .../thermodynamic_conductor_elite.json | 2 +- .../thermodynamic_conductor_ultimate.json | 2 +- .../blockstates/universal_cable_advanced.json | 2 +- .../blockstates/universal_cable_basic.json | 2 +- .../blockstates/universal_cable_elite.json | 2 +- .../blockstates/universal_cable_ultimate.json | 2 +- ...er_large.obj => transmitter_large.obj.mek} | 0 ...er_small.obj => transmitter_small.obj.mek} | 0 31 files changed, 381 insertions(+), 251 deletions(-) create mode 100644 src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java delete mode 100644 src/main/java/mekanism/client/render/transmitter/TransmitterRenderState.java rename src/main/resources/assets/mekanism/models/block/{transmitter_large.obj => transmitter_large.obj.mek} (100%) rename src/main/resources/assets/mekanism/models/block/{transmitter_small.obj => transmitter_small.obj.mek} (100%) diff --git a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java index c34aa5d5d..a22df7545 100644 --- a/src/main/java/mekanism/client/render/obj/GlowPanelModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -1,11 +1,6 @@ package mekanism.client.render.obj; -import java.lang.reflect.Field; -import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; import java.util.Map; import java.util.Set; @@ -26,53 +21,33 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; -import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJModel; import net.minecraftforge.client.model.obj.OBJModel.Face; -import net.minecraftforge.client.model.obj.OBJModel.Group; -import net.minecraftforge.client.model.obj.OBJModel.Normal; import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; -import net.minecraftforge.client.model.obj.OBJModel.OBJState; -import net.minecraftforge.client.model.obj.OBJModel.TextureCoordinate; -import net.minecraftforge.client.model.obj.OBJModel.Vertex; -import net.minecraftforge.client.model.pipeline.LightUtil; -import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.common.property.IExtendedBlockState; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartModel +public class GlowPanelModel extends OBJBakedModelBase implements ISmartMultipartModel { - private IBakedModel baseModel; - - private HashMap transformationMap = new HashMap(); - private static Map glowPanelCache = new HashMap(); private static Map glowPanelItemCache = new HashMap(); private Set bakedQuads; private IBlockState tempState; - private TextureAtlasSprite tempSprite; private ItemStack tempStack; - private ImmutableMap textureMap; public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { - model.super(model, state, format, textures); - baseModel = base; - transformationMap = transform; - textureMap = textures; + super(base, model, state, format, textures, transform); } public static void forceRebake() @@ -104,7 +79,7 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode if(!glowPanelCache.containsKey(hash)) { - GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); + GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), textureMap, transformationMap); model.tempState = state; glowPanelCache.put(hash, model); } @@ -148,176 +123,19 @@ public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartMode return bakedModel; } - - @Override - public List getGeneralQuads() - { - if(bakedQuads == null) - { - bakedQuads = Collections.synchronizedSet(new LinkedHashSet()); - Set faces = Collections.synchronizedSet(new LinkedHashSet()); - Optional transform = Optional.absent(); - Set coloredFaces = new HashSet(); - - for(Group g : getModel().getMatLib().getGroups().values()) - { - if(getState() instanceof OBJState) - { - OBJState state = (OBJState)getState(); - - if(state.parent != null) - { - transform = state.parent.apply(Optional.absent()); - } - - if(state.getGroupsWithVisibility(true).contains(g.getName())) - { - LinkedHashSet tempFaces = g.applyTransform(transform); - faces.addAll(tempFaces); - - if(g.getName().equals("light")) - { - coloredFaces.addAll(tempFaces); - } - } - } - else { - transform = getState().apply(Optional.absent()); - LinkedHashSet tempFaces = g.applyTransform(transform); - faces.addAll(tempFaces); - - if(g.getName().equals("light")) - { - coloredFaces.addAll(tempFaces); - } - } - } - - for(Face f : faces) - { - if(getModel().getMatLib().getMaterial(f.getMaterialName()).isWhite()) - { - for(Vertex v : f.getVertices()) - { - if(!v.getMaterial().equals(getModel().getMatLib().getMaterial(v.getMaterial().getName()))) - { - v.setMaterial(getModel().getMatLib().getMaterial(v.getMaterial().getName())); - } - } - - tempSprite = ModelLoader.White.instance; - } - else { - tempSprite = textureMap.get(f.getMaterialName()); - } - - float[] color = new float[] { 1, 1, 1, 1 }; - - if(coloredFaces.contains(f)) - { - EnumColor c = getColor(); - color = new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1}; - } - - UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(getFormat()); - builder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)); - builder.setQuadColored(); - builder.setQuadTint(0); - - Normal faceNormal = f.getNormal(); - putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, getFormat(), color); - putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, getFormat(), color); - putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, getFormat(), color); - putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, getFormat(), color); - - bakedQuads.add(builder.build()); - } - } - - List quadList = Collections.synchronizedList(Lists.newArrayList(bakedQuads)); - - return quadList; - } - - private static final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, VertexFormat format, float[] color) - { - for(int e = 0; e < format.getElementCount(); e++) - { - switch(format.getElement(e).getUsage()) - { - case POSITION: - builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w); - break; - case COLOR: - float d; - - if(v.hasNormal()) - { - d = LightUtil.diffuseLight(v.getNormal().x, v.getNormal().y, v.getNormal().z); - } - else { - d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); - } - - if(v.getMaterial() != null) - { - builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]); - } - else { - builder.put(e, d, d, d, 1); - } - - break; - case UV: - if(!v.hasTextureCoordinate()) - { - builder.put(e, sprite.getInterpolatedU(defUV.u * 16), sprite.getInterpolatedV((1 - defUV.v) * 16), 0, 1); - } - else { - builder.put(e, sprite.getInterpolatedU(v.getTextureCoordinate().u * 16), sprite.getInterpolatedV((1 - v.getTextureCoordinate().v) * 16), 0, 1); - } - - break; - case NORMAL: - if(!v.hasNormal()) - { - builder.put(e, faceNormal.x, faceNormal.y, faceNormal.z, 0); - } - else { - builder.put(e, v.getNormal().x, v.getNormal().y, v.getNormal().z, 0); - } - - break; - default: - builder.put(e); - } - } - } - - private static Field f_textures; - public static ImmutableMap getTexturesForOBJModel(IBakedModel model) + @Override + public float[] getOverrideColor(Face f, String groupName) { - try { - if(f_textures == null) - { - f_textures = OBJBakedModel.class.getDeclaredField("textures"); - f_textures.setAccessible(true); - } - - return (ImmutableMap)f_textures.get(model); - } catch(Exception e) { - e.printStackTrace(); + if(groupName.equals("light")) + { + EnumColor c = getColor(); + return new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1}; } return null; } - - public ImmutableMap getTextures() - { - return getTexturesForOBJModel(this); - } - + private Pair thirdPersonTransform; @Override diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index 32176f564..1d4a0ec89 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -105,21 +105,28 @@ public class MekanismOBJLoader extends OBJLoader @Override public IModel loadModel(ResourceLocation loc) throws IOException { - if(!modelCache.containsKey(loc)) + ResourceLocation file = new ResourceLocation(loc.getResourceDomain(), loc.getResourcePath()); + + if(!modelCache.containsKey(file)) { - IModel model = super.loadModel(loc); + IModel model = super.loadModel(file); if(model instanceof OBJModel) { - if(loc.getResourcePath().contains("glow_panel")) + if(file.getResourcePath().contains("glow_panel")) { - MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.GLOW_PANEL, ((OBJModel)model).getMatLib(), loc); - modelCache.put(loc, mekModel); + MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.GLOW_PANEL, ((OBJModel)model).getMatLib(), file); + modelCache.put(file, mekModel); + } + else if(file.getResourcePath().contains("transmitter")) + { + MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.TRANSMITTER, ((OBJModel)model).getMatLib(), file); + modelCache.put(file, mekModel); } } } - MekanismOBJModel mekModel = modelCache.get(loc); + MekanismOBJModel mekModel = modelCache.get(file); if(mekModel == null) { diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index c3f354130..058455754 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -29,12 +29,17 @@ public class MekanismOBJModel extends OBJModel { return new GlowPanelModel(preBaked, this, state, format, GlowPanelModel.getTexturesForOBJModel(preBaked), null); } + else if(modelType == OBJModelType.TRANSMITTER) + { + return new TransmitterModel(preBaked, this, state, format, TransmitterModel.getTexturesForOBJModel(preBaked), null); + } return null; } public static enum OBJModelType { - GLOW_PANEL + GLOW_PANEL, + TRANSMITTER } } diff --git a/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java new file mode 100644 index 000000000..16beea946 --- /dev/null +++ b/src/main/java/mekanism/client/render/obj/OBJBakedModelBase.java @@ -0,0 +1,281 @@ +package mekanism.client.render.obj; + +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.vecmath.Matrix4f; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.Face; +import net.minecraftforge.client.model.obj.OBJModel.Group; +import net.minecraftforge.client.model.obj.OBJModel.Normal; +import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJState; +import net.minecraftforge.client.model.obj.OBJModel.TextureCoordinate; +import net.minecraftforge.client.model.obj.OBJModel.Vertex; +import net.minecraftforge.client.model.pipeline.LightUtil; +import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; + +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; + +public abstract class OBJBakedModelBase extends OBJBakedModel +{ + protected IBakedModel baseModel; + + protected TextureAtlasSprite tempSprite = ModelLoader.White.instance; + + protected ImmutableMap textureMap; + + protected HashMap transformationMap = new HashMap(); + + private Set bakedQuads; + + public OBJBakedModelBase(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) + { + model.super(model, state, format, textures); + baseModel = base; + transformationMap = transform; + textureMap = textures; + + if(state instanceof OBJState) + { + updateStateVisibilityMap((OBJState)state); + } + } + + @Override + public List getGeneralQuads() + { + if(bakedQuads == null) + { + bakedQuads = Collections.synchronizedSet(new LinkedHashSet()); + Set faces = Collections.synchronizedSet(new LinkedHashSet()); + Optional transform = Optional.absent(); + Map groupNameMap = new HashMap(); + + for(Group g : getModel().getMatLib().getGroups().values()) + { + if(getState() instanceof OBJState) + { + OBJState state = (OBJState)getState(); + + if(state.parent != null) + { + transform = state.parent.apply(Optional.absent()); + } + + updateStateVisibilityMap(state); + + if(state.getGroupsWithVisibility(true).contains(g.getName())) + { + Set groupFaces = g.applyTransform(transform); + + for(Face f : groupFaces) + { + groupNameMap.put(f, g.getName()); + faces.add(f); + } + } + } + else { + transform = getState().apply(Optional.absent()); + Set groupFaces = g.applyTransform(transform); + + for(Face f : groupFaces) + { + groupNameMap.put(f, g.getName()); + faces.add(f); + } + } + } + + for(Face f : faces) + { + String groupName = groupNameMap.get(f); + + if(getOverrideTexture(f, groupName) != null) + { + tempSprite = getOverrideTexture(f, groupName); + } + else if(getModel().getMatLib().getMaterial(f.getMaterialName()).isWhite()) + { + for(Vertex v : f.getVertices()) + { + if(!v.getMaterial().equals(getModel().getMatLib().getMaterial(v.getMaterial().getName()))) + { + v.setMaterial(getModel().getMatLib().getMaterial(v.getMaterial().getName())); + } + } + + tempSprite = ModelLoader.White.instance; + } + else { + tempSprite = textureMap.get(f.getMaterialName()); + } + + float[] color = new float[] {1, 1, 1, 1}; + + if(getOverrideColor(f, groupName) != null) + { + color = getOverrideColor(f, groupName); + } + + UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder(getFormat()); + builder.setQuadOrientation(EnumFacing.getFacingFromVector(f.getNormal().x, f.getNormal().y, f.getNormal().z)); + builder.setQuadColored(); + builder.setQuadTint(0); + + Normal faceNormal = f.getNormal(); + putVertexData(builder, f.getVertices()[0], faceNormal, TextureCoordinate.getDefaultUVs()[0], tempSprite, getFormat(), color); + putVertexData(builder, f.getVertices()[1], faceNormal, TextureCoordinate.getDefaultUVs()[1], tempSprite, getFormat(), color); + putVertexData(builder, f.getVertices()[2], faceNormal, TextureCoordinate.getDefaultUVs()[2], tempSprite, getFormat(), color); + putVertexData(builder, f.getVertices()[3], faceNormal, TextureCoordinate.getDefaultUVs()[3], tempSprite, getFormat(), color); + + bakedQuads.add(builder.build()); + } + } + + List quadList = Collections.synchronizedList(Lists.newArrayList(bakedQuads)); + + return quadList; + } + + public static final void putVertexData(UnpackedBakedQuad.Builder builder, Vertex v, Normal faceNormal, TextureCoordinate defUV, TextureAtlasSprite sprite, VertexFormat format, float[] color) + { + for(int e = 0; e < format.getElementCount(); e++) + { + switch(format.getElement(e).getUsage()) + { + case POSITION: + builder.put(e, v.getPos().x, v.getPos().y, v.getPos().z, v.getPos().w); + break; + case COLOR: + float d; + + if(v.hasNormal()) + { + d = LightUtil.diffuseLight(v.getNormal().x, v.getNormal().y, v.getNormal().z); + } + else { + d = LightUtil.diffuseLight(faceNormal.x, faceNormal.y, faceNormal.z); + } + + if(v.getMaterial() != null) + { + builder.put(e, d * v.getMaterial().getColor().x * color[0], d * v.getMaterial().getColor().y * color[1], d * v.getMaterial().getColor().z * color[2], v.getMaterial().getColor().w * color[3]); + } + else { + builder.put(e, d, d, d, 1); + } + + break; + case UV: + if(!v.hasTextureCoordinate()) + { + builder.put(e, sprite.getInterpolatedU(defUV.u * 16), sprite.getInterpolatedV((1 - defUV.v) * 16), 0, 1); + } + else { + builder.put(e, sprite.getInterpolatedU(v.getTextureCoordinate().u * 16), sprite.getInterpolatedV((1 - v.getTextureCoordinate().v) * 16), 0, 1); + } + + break; + case NORMAL: + if(!v.hasNormal()) + { + builder.put(e, faceNormal.x, faceNormal.y, faceNormal.z, 0); + } + else { + builder.put(e, v.getNormal().x, v.getNormal().y, v.getNormal().z, 0); + } + + break; + default: + builder.put(e); + } + } + } + + protected void updateStateVisibilityMap(OBJState state) + { + if(state.getVisibilityMap().containsKey(Group.ALL)) + { + boolean operation = state.getVisibilityMap().get(Group.ALL); + state.getVisibilityMap().clear(); + + for(String s : getModel().getMatLib().getGroups().keySet()) + { + state.getVisibilityMap().put(s, OBJState.Operation.SET_TRUE.performOperation(operation)); + } + } + else if(state.getVisibilityMap().containsKey(Group.ALL_EXCEPT)) + { + List exceptList = state.getGroupNamesFromMap().subList(1, state.getGroupNamesFromMap().size()); + state.getVisibilityMap().remove(Group.ALL_EXCEPT); + + for(String s : this.getModel().getMatLib().getGroups().keySet()) + { + if(!exceptList.contains(s)) + { + state.getVisibilityMap().put(s, OBJState.Operation.SET_TRUE.performOperation(state.getVisibilityMap().get(s))); + } + } + } + else { + for(String s : state.getVisibilityMap().keySet()) + { + state.getVisibilityMap().put(s, OBJState.Operation.SET_TRUE.performOperation(state.getVisibilityMap().get(s))); + } + } + } + + private static Field f_textures; + + public static ImmutableMap getTexturesForOBJModel(IBakedModel model) + { + try { + if(f_textures == null) + { + f_textures = OBJBakedModel.class.getDeclaredField("textures"); + f_textures.setAccessible(true); + } + + return (ImmutableMap)f_textures.get(model); + } catch(Exception e) { + e.printStackTrace(); + } + + return null; + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return tempSprite; + } + + protected float[] getOverrideColor(Face f, String groupName) + { + return null; + } + + protected TextureAtlasSprite getOverrideTexture(Face f, String groupName) + { + return null; + } +} diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index f0d798c8a..e6dc3d33e 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -2,11 +2,13 @@ package mekanism.client.render.obj; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; import javax.vecmath.Matrix4f; import mcmultipart.client.multipart.ISmartMultipartModel; +import mekanism.common.multipart.ColorProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; @@ -14,42 +16,65 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumWorldBlockLayer; +import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.IModelState; import net.minecraftforge.client.model.obj.OBJModel; -import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.client.model.obj.OBJModel.Face; +import net.minecraftforge.client.model.obj.OBJModel.Group; +import net.minecraftforge.client.model.obj.OBJModel.OBJProperty; +import net.minecraftforge.client.model.obj.OBJModel.OBJState; +import net.minecraftforge.common.property.IExtendedBlockState; import com.google.common.collect.ImmutableMap; -public class TransmitterModel extends OBJBakedModel implements ISmartMultipartModel +public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipartModel { - private IBakedModel baseModel; - - private HashMap transformationMap = new HashMap(); - - private static Map modelCache = new HashMap(); + private Map modelCache = new HashMap(); private Set bakedQuads; private IBlockState tempState; - private TextureAtlasSprite tempSprite; private ItemStack tempStack; - private ImmutableMap textureMap; public TransmitterModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { - model.super(model, state, format, textures); - baseModel = base; - transformationMap = transform; - textureMap = textures; - } - - public static void forceRebake() - { - modelCache.clear(); + super(base, model, state, format, textures, transform); } @Override - public IBakedModel handlePartState(IBlockState arg0) + public IBakedModel handlePartState(IBlockState state) { + IExtendedBlockState extended = (IExtendedBlockState)state; + EnumWorldBlockLayer layer = MinecraftForgeClient.getRenderLayer(); + int color = extended.getValue(ColorProperty.INSTANCE).color.ordinal(); + OBJState obj = extended.getValue(OBJProperty.instance); + + if(layer != EnumWorldBlockLayer.TRANSLUCENT) + { + color = -1; + } + + int hash = Objects.hash(layer.ordinal(), 5, color, obj.hashCode()); + + if(obj.getVisibilityMap().containsKey(Group.ALL) || obj.getVisibilityMap().containsKey(Group.ALL_EXCEPT)) + { + updateStateVisibilityMap(obj); + } + + if(!modelCache.containsKey(hash)) + { + TransmitterModel model = new TransmitterModel(baseModel, getModel(), getState(), getFormat(), textureMap, transformationMap); + model.tempState = state; + modelCache.put(hash, model); + } + + return modelCache.get(hash); + } + + @Override + public TextureAtlasSprite getOverrideTexture(Face f, String groupName) + { + System.out.println(groupName); return null; } } diff --git a/src/main/java/mekanism/client/render/transmitter/TransmitterRenderState.java b/src/main/java/mekanism/client/render/transmitter/TransmitterRenderState.java deleted file mode 100644 index 20b3ae979..000000000 --- a/src/main/java/mekanism/client/render/transmitter/TransmitterRenderState.java +++ /dev/null @@ -1,6 +0,0 @@ -package mekanism.client.render.transmitter; - -public class TransmitterRenderState -{ - -} \ No newline at end of file diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 5c3b8d444..ecb91339f 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -199,9 +199,9 @@ public class MultipartMekanism implements IPartFactory @SubscribeEvent public void onModelBake(ModelBakeEvent event) { - String[] names = new String[] {"mekanism:universal_cable_basic", - "mekanism:universal_cable_advanced", "mekanism:universal_cable_elite", - "mekanism:universal_cable_ultimate", "mekanism:mechanical_pipe", + String[] names = new String[] { + "mekanism:universal_cable_basic", "mekanism:universal_cable_advanced", + "mekanism:universal_cable_elite", "mekanism:universal_cable_ultimate", "mekanism:mechanical_pipe_basic", "mekanism:mechanical_pipe_advanced", "mekanism:mechanical_pipe_elite", "mekanism:mechanical_pipe_ultimate", "mekanism:pressurized_tube_basic", "mekanism:pressurized_tube_advanced", @@ -211,16 +211,16 @@ public class MultipartMekanism implements IPartFactory "mekanism:restrictive_transporter", "mekanism:diversion_transporter", "mekanism:thermodynamic_conductor_basic", "mekanism:thermodynamic_conductor_advanced", "mekanism:thermodynamic_conductor_elite", "mekanism:thermodynamic_conductor_ultimate"}; - + for(String s : names) { ModelResourceLocation mrl = new ModelResourceLocation(s, "multipart"); IBakedModel model = event.modelRegistry.getObject(mrl); + if(model instanceof ISmartBlockModel) { event.modelRegistry.putObject(mrl, new BlockToMultipartModel((ISmartBlockModel)model)); } } } - } diff --git a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json index d3d67a8c2..8d18b5dad 100644 --- a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json +++ b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json index ac0c9bbd4..edef2e009 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json index c93d445b2..52d38fd56 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json index 9ad860b3a..a33994e5f 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json index a729be189..9c1d2eb14 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json index c9b7bfa9f..3324eb49b 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json index 6ea8101e7..55223a492 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json index d140f5401..ff465fdb1 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json index 06a5e9e21..1023289c7 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json index 9975a886c..d413915fd 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/PressurizedTubeAdvanced" diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json index 777dc734b..6ebd36056 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalBasic", "#center": "mekanism:blocks/models/multipart/PressurizedTubeBasic" diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json index a6a06d623..01a477b86 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalElite", "#center": "mekanism:blocks/models/multipart/PressurizedTubeElite" diff --git a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json index 9fabfdf3e..2bef1be01 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/PressurizedTubeVerticalUltimate", "#center": "mekanism:blocks/models/multipart/PressurizedTubeUltimate" diff --git a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json index 76142e8ae..a91ad9738 100644 --- a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json +++ b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json @@ -10,7 +10,7 @@ } }, "variants": { - "multipart": [{"model": "mekanism:transmitter_large.obj"}] + "multipart": [{"model": "mekanism:transmitter_large.obj.mek"}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json index b3acce8b7..bdb6e19dd 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorAdvanced" diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json index 4acf7d9d8..81fef4479 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalBasic", "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorBasic" diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json index 30099d541..9c2010cf2 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalElite", "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorElite" diff --git a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json index c63b302d8..b1c3c4aa4 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/ThermodynamicConductorVerticalUltimate", "#center": "mekanism:blocks/models/multipart/ThermodynamicConductorUltimate" diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json index cb7dddb74..14c7a6a08 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalAdvanced", "#center": "mekanism:blocks/models/multipart/UniversalCableAdvanced" diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json index 27014a621..9426538f6 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalBasic", "#center": "mekanism:blocks/models/multipart/UniversalCableBasic" diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json index a2bbdf881..cf2b961b9 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalElite", "#center": "mekanism:blocks/models/multipart/UniversalCableElite" diff --git a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json index 44bd1853f..bec1e9505 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json @@ -1,7 +1,7 @@ { "forge_marker": 1, "defaults": { - "model": "mekanism:transmitter_small.obj", + "model": "mekanism:transmitter_small.obj.mek", "textures": { "#side": "mekanism:blocks/models/multipart/UniversalCableVerticalUltimate", "#center": "mekanism:blocks/models/multipart/UniversalCableUltimate" diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_large.obj b/src/main/resources/assets/mekanism/models/block/transmitter_large.obj.mek similarity index 100% rename from src/main/resources/assets/mekanism/models/block/transmitter_large.obj rename to src/main/resources/assets/mekanism/models/block/transmitter_large.obj.mek diff --git a/src/main/resources/assets/mekanism/models/block/transmitter_small.obj b/src/main/resources/assets/mekanism/models/block/transmitter_small.obj.mek similarity index 100% rename from src/main/resources/assets/mekanism/models/block/transmitter_small.obj rename to src/main/resources/assets/mekanism/models/block/transmitter_small.obj.mek