From f04899e01c8ea2bb157b1ddeb4d2e9b3affed189 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 24 May 2016 19:22:59 -0400 Subject: [PATCH] Transmitters render in item form, though I'd love to find a way to disable cull face for these item models --- .../java/mekanism/client/ClientProxy.java | 2 +- .../client/render/obj/MekanismOBJLoader.java | 1 + .../client/render/obj/TransmitterModel.java | 30 +++++++++++++++++++ .../common/multipart/ItemPartTransmitter.java | 15 +++++++++- .../blockstates/diversion_transporter.json | 4 ++- .../logistical_transporter_advanced.json | 4 ++- .../logistical_transporter_basic.json | 4 ++- .../logistical_transporter_elite.json | 4 ++- .../logistical_transporter_ultimate.json | 4 ++- .../blockstates/mechanical_pipe_advanced.json | 4 ++- .../blockstates/mechanical_pipe_basic.json | 4 ++- .../blockstates/mechanical_pipe_elite.json | 4 ++- .../blockstates/mechanical_pipe_ultimate.json | 4 ++- .../pressurized_tube_advanced.json | 3 +- .../blockstates/pressurized_tube_basic.json | 3 +- .../blockstates/pressurized_tube_elite.json | 3 +- .../pressurized_tube_ultimate.json | 3 +- .../blockstates/restrictive_transporter.json | 4 ++- .../thermodynamic_conductor_advanced.json | 3 +- .../thermodynamic_conductor_basic.json | 3 +- .../thermodynamic_conductor_elite.json | 3 +- .../thermodynamic_conductor_ultimate.json | 3 +- .../blockstates/universal_cable_advanced.json | 3 +- .../blockstates/universal_cable_basic.json | 3 +- .../blockstates/universal_cable_elite.json | 3 +- .../blockstates/universal_cable_ultimate.json | 3 +- 26 files changed, 100 insertions(+), 24 deletions(-) diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 94428aa12..81955453b 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -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); diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index 1d4a0ec89..8364bb2fc 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -61,6 +61,7 @@ public class MekanismOBJLoader extends OBJLoader { try { Function textureGetter = new Function() { + @Override public TextureAtlasSprite apply(ResourceLocation location) { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); diff --git a/src/main/java/mekanism/client/render/obj/TransmitterModel.java b/src/main/java/mekanism/client/render/obj/TransmitterModel.java index 1a190eaaf..7e764ec21 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterModel.java @@ -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 modelCache = new HashMap(); + 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 visible = new ArrayList(); + + 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 getGeneralQuads() + { + return super.getGeneralQuads(); + } + @Override public float[] getOverrideColor(Face f, String groupName) { diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 740e50a58..ab495b856 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -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; + } } diff --git a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json index 8d18b5dad..08654e11e 100644 --- a/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json +++ b/src/main/resources/assets/mekanism/blockstates/diversion_transporter.json @@ -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": [{}] } } 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 edef2e009..f99e7e694 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_advanced.json @@ -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": [{}] } } 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 52d38fd56..e0cd7bd25 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_basic.json @@ -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": [{}] } } 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 a33994e5f..7893e6b04 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_elite.json @@ -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": [{}] } } 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 9c1d2eb14..71a77c6ec 100644 --- a/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/logistical_transporter_ultimate.json @@ -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": [{}] } } 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 3324eb49b..02d021f62 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_advanced.json @@ -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": [{}] } } 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 55223a492..07d723e0e 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_basic.json @@ -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": [{}] } } 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 ff465fdb1..10c7b5d9a 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_elite.json @@ -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": [{}] } } 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 1023289c7..18101524f 100644 --- a/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/mechanical_pipe_ultimate.json @@ -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": [{}] } } 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 d413915fd..661851c03 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_advanced.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 6ebd36056..085b9d61f 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_basic.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 01a477b86..0ced8a8af 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_elite.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 2bef1be01..37e5a9dc1 100644 --- a/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/pressurized_tube_ultimate.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json index a91ad9738..634a42b06 100644 --- a/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json +++ b/src/main/resources/assets/mekanism/blockstates/restrictive_transporter.json @@ -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": [{}] } } 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 bdb6e19dd..9ad53f079 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_advanced.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 81fef4479..5de7b5510 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_basic.json @@ -11,6 +11,7 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } \ No newline at end of file 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 9c2010cf2..c1544f457 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_elite.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 b1c3c4aa4..f9b79a7a9 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/thermodynamic_conductor_ultimate.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 14c7a6a08..6c563d120 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_advanced.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 9426538f6..677ebd7cf 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_basic.json @@ -11,6 +11,7 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } \ No newline at end of file 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 cf2b961b9..f1ea1ccb8 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_elite.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } } 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 bec1e9505..27040acab 100644 --- a/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json +++ b/src/main/resources/assets/mekanism/blockstates/universal_cable_ultimate.json @@ -11,7 +11,8 @@ } }, "variants": { - "multipart": [{}] + "multipart": [{}], + "inventory": [{}] } }