Transmitters render in item form, though I'd love to find a way to disable cull face for these item models

This commit is contained in:
aidancbrady committed 2016-05-24 19:22:59 -04:00
1 parent aecb4ec3ab
commit f04899e01c
26 files changed
+100 -24

No files matched your search

@@ -340,7 +340,7 @@ public class ClientProxy extends CommonProxy
@Override
public void registerItemRenders()
{
// registerItemRender(MekanismItems.PartTransmitter);
registerItemRender(MekanismItems.PartTransmitter);
registerItemRender(MekanismItems.ElectricBow);
registerItemRender(MekanismItems.Dust);
registerItemRender(MekanismItems.Ingot);
@@ -61,6 +61,7 @@ public class MekanismOBJLoader extends OBJLoader
{
try {
Function<ResourceLocation, TextureAtlasSprite> textureGetter = new Function<ResourceLocation, TextureAtlasSprite>() {
@Override
public TextureAtlasSprite apply(ResourceLocation location)
{
return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
@@ -1,6 +1,8 @@
package mekanism.client.render.obj;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -13,6 +15,7 @@ import mekanism.common.multipart.ConnectionProperty;
import mekanism.common.multipart.PartSidedPipe;
import mekanism.common.multipart.PartSidedPipe.ConnectionType;
import net.minecraft.block.state.IBlockState;
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.texture.TextureMap;
@@ -20,6 +23,7 @@ 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.EnumFacing.Axis;
import net.minecraft.util.EnumWorldBlockLayer;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.MinecraftForgeClient;
@@ -36,6 +40,7 @@ import com.google.common.collect.ImmutableMap;
public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipartModel
{
private Map<Integer, TransmitterModel> modelCache = new HashMap<Integer, TransmitterModel>();
private TransmitterModel itemCache;
private IBlockState tempState;
private ItemStack tempStack;
@@ -87,6 +92,31 @@ public class TransmitterModel extends OBJBakedModelBase implements ISmartMultipa
return modelCache.get(hash);
}
@Override
public IBakedModel handleItemState(ItemStack stack)
{
if(itemCache == null)
{
List<String> visible = new ArrayList<String>();
for(EnumFacing side : EnumFacing.values())
{
visible.add(side.getName() + (side.getAxis() == Axis.Y ? "NORMAL" : "NONE"));
}
itemCache = new TransmitterModel(baseModel, getModel(), new OBJState(visible, true), getFormat(), textureMap, transformationMap);
itemCache.tempStack = stack;
}
return itemCache;
}
@Override
public List<BakedQuad> getGeneralQuads()
{
return super.getGeneralQuads();
}
@Override
public float[] getOverrideColor(Face f, String groupName)
{
@@ -11,6 +11,7 @@ import mekanism.client.MekanismKeyHandler;
import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.IMetaItem;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
//import net.minecraft.client.renderer.texture.IIconRegister;
@@ -32,7 +33,7 @@ import codechicken.multipart.TMultiPart;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemPartTransmitter extends ItemMultiPart
public class ItemPartTransmitter extends ItemMultiPart implements IMetaItem
{
public ItemPartTransmitter()
{
@@ -175,4 +176,16 @@ public class ItemPartTransmitter extends ItemMultiPart
{
return getUnlocalizedName() + "." + TransmitterType.values()[stack.getItemDamage()].getName();
}
@Override
public String getTexture(int meta)
{
return TransmitterType.values()[meta].name().toLowerCase();
}
@Override
public int getVariants()
{
return TransmitterType.values().length;
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/DiversionTransporterVertical",
"#center": "mekanism:blocks/models/multipart/DiversionTransporter"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalAdvanced",
"#center": "mekanism:blocks/models/multipart/LogisticalTransporterAdvanced"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalBasic",
"#center": "mekanism:blocks/models/multipart/LogisticalTransporterBasic"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalElite",
"#center": "mekanism:blocks/models/multipart/LogisticalTransporterElite"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/LogisticalTransporterVerticalUltimate",
"#center": "mekanism:blocks/models/multipart/LogisticalTransporterUltimate"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalAdvanced",
"#center": "mekanism:blocks/models/multipart/MechanicalPipeAdvanced"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalBasic",
"#center": "mekanism:blocks/models/multipart/MechanicalPipeBasic"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalElite",
"#center": "mekanism:blocks/models/multipart/MechanicalPipeElite"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/MechanicalPipeVerticalUltimate",
"#center": "mekanism:blocks/models/multipart/MechanicalPipeUltimate"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -1,6 +1,7 @@
{
"forge_marker": 1,
"defaults": {
"model": "mekanism:transmitter_large.obj.mek",
"textures": {
"#side": "mekanism:blocks/models/multipart/RestrictiveTransporterVertical",
"#center": "mekanism:blocks/models/multipart/RestrictiveTransporter"
@@ -10,7 +11,8 @@
}
},
"variants": {
"multipart": [{"model": "mekanism:transmitter_large.obj.mek"}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,6 +11,7 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,6 +11,7 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}
@@ -11,7 +11,8 @@
}
},
"variants": {
"multipart": [{}]
"multipart": [{}],
"inventory": [{}]
}
}