diff --git a/.gitignore b/.gitignore index 9cbed3dfa..9501d77be 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ MDK.zip gradlew *.txt -*.mtl *.blend1 *.blend2 /bin diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index fae65f366..06bd7bd19 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -191,6 +191,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; import net.minecraftforge.fml.client.registry.ClientRegistry; @@ -429,6 +430,8 @@ public class ClientProxy extends CommonProxy ModelBakery.registerItemVariants(MekanismItems.CraftingFormula, ItemCraftingFormula.MODEL, ItemCraftingFormula.INVALID_MODEL, ItemCraftingFormula.ENCODED_MODEL); + OBJLoader.instance.addDomain("mekanism"); + Mekanism.logger.info("Render registrations complete."); } diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index e55fe9af7..7e653786a 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -7,6 +7,10 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.RenderGlowPanel; import mekanism.common.MekanismItems; +import mekanism.common.block.states.BlockStateFacing; + +import net.minecraft.block.state.BlockState; +import net.minecraft.block.state.IBlockState; import net.minecraft.client.particle.EffectRenderer; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +21,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.EnumFacing; +import net.minecraft.util.Vec3; /* import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; @@ -33,6 +38,7 @@ import codechicken.multipart.NormalOcclusionTest; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; */ +import mcmultipart.MCMultiPartMod; import mcmultipart.block.TileMultipart; import mcmultipart.microblock.IMicroblock; import mcmultipart.microblock.IMicroblock.IFaceMicroblock; @@ -41,6 +47,7 @@ import mcmultipart.multipart.IOccludingPart; import mcmultipart.multipart.Multipart; import mcmultipart.multipart.PartSlot; import mcmultipart.raytrace.PartMOP; +import mcmultipart.util.TransformationHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -55,12 +62,11 @@ public class PartGlowPanel extends Multipart implements IOccludingPart//, JIconH static { AxisAlignedBB cuboid = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 0.125, 0.75); -// Translation fromOrigin = new Translation(Vector3.center); -// Translation toOrigin = (Translation)fromOrigin.inverse(); - - for(int i = 0; i < 6; i++) + Vec3 fromOrigin = new Vec3(-0.5, -0.5, -0.5); + + for(EnumFacing side : EnumFacing.VALUES) { - bounds[i] = cuboid;//.copy().apply(toOrigin).apply(Rotation.sideRotations[i]).apply(fromOrigin); + bounds[side.ordinal()] = TransformationHelper.rotate(cuboid.offset(fromOrigin.xCoord, fromOrigin.yCoord, fromOrigin.zCoord), side).offset(-fromOrigin.xCoord, -fromOrigin.zCoord, -fromOrigin.zCoord); } } @@ -218,4 +224,22 @@ public class PartGlowPanel extends Multipart implements IOccludingPart//, JIconH Coord4D adj = new Coord4D(getPos().offset(side), getWorld().provider.getDimensionId()); return getWorld().isSideSolid(adj, side.getOpposite()) || (getContainer().getPartInSlot(PartSlot.getFaceSlot(side)) instanceof IFaceMicroblock && ((IFaceMicroblock)getContainer().getPartInSlot(PartSlot.getFaceSlot(side))).isFaceHollow()); } + + @Override + public String getModelPath() + { + return getType(); + } + + @Override + public BlockState createBlockState() + { + return new BlockStateFacing(MCMultiPartMod.multipart); + } + + @Override + public IBlockState getExtendedState(IBlockState state) + { + return state.withProperty(BlockStateFacing.facingProperty, side); + } } diff --git a/src/main/resources/assets/mekanism/blockstates/glow_panel.json b/src/main/resources/assets/mekanism/blockstates/glow_panel.json new file mode 100644 index 000000000..7b18b966c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/glow_panel.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:glow_panel.obj" + }, + "variants": { + "normal": [{}], + "facing": { + "up": {"x": 180}, + "down": {}, + "north": {"x": 90, "y": 180}, + "south": {"x": 90}, + "east": {"x": 90, "y": -90}, + "west": {"x": 90, "y": 90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/glow_panel.mtl b/src/main/resources/assets/mekanism/models/block/glow_panel.mtl new file mode 100644 index 000000000..f3b0f91ad --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/glow_panel.mtl @@ -0,0 +1,12 @@ +# Blender MTL File: 'glow_panel.blend' +# Material Count: 1 + +newmtl Material +Ns 96.078431 +Ka 0.000000 0.000000 0.000000 +Kd 0.640000 0.640000 0.640000 +Ks 0.500000 0.500000 0.500000 +Ni 1.000000 +d 1.000000 +illum 2 +map_Kd mekanism:blocks/models/multipart/GlowPanel diff --git a/src/main/resources/assets/mekanism/models/block/glow_panel.obj b/src/main/resources/assets/mekanism/models/block/glow_panel.obj new file mode 100644 index 000000000..d990cba8d --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/glow_panel.obj @@ -0,0 +1,73 @@ +# Blender v2.74 (sub 0) OBJ File: 'glow_panel.blend' +# www.blender.org +mtllib glow_panel.mtl +o light +v 0.687500 -0.010000 0.687500 +v 0.312500 -0.010000 0.687500 +v 0.312500 -0.010000 0.312500 +v 0.687500 -0.010000 0.312500 +v 0.687500 0.150000 0.687500 +v 0.312500 0.150000 0.687500 +v 0.312500 0.150000 0.312500 +v 0.687500 0.150000 0.312500 +vt 0.312500 0.312500 +vt 0.687500 0.312500 +vt 0.687500 0.687500 +vt 0.312500 0.687500 +vt 0.687500 0.593750 +vt 0.312500 0.593750 +vt 0.593750 0.687500 +vt 0.593750 0.312500 +vt 0.687500 0.406250 +vt 0.312500 0.406250 +vt 0.406250 0.312500 +vt 0.406250 0.687500 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn -0.000000 0.000000 1.000000 +vn -1.000000 -0.000000 -0.000000 +vn 0.000000 -0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +usemtl Material +s off +f 1/1/1 2/2/1 3/3/1 4/4/1 +f 5/1/2 8/2/2 7/3/2 6/4/2 +f 1/5/3 5/3/3 6/4/3 2/6/3 +f 2/3/4 6/7/4 7/8/4 3/2/4 +f 3/2/5 7/9/5 8/10/5 4/1/5 +f 5/1/6 1/11/6 4/12/6 8/4/6 +o frame +v 0.750000 0.000000 0.750000 +v 0.250000 0.000000 0.750000 +v 0.250000 0.000000 0.250000 +v 0.750000 0.000000 0.250000 +v 0.750000 0.125000 0.750000 +v 0.250000 0.125000 0.750000 +v 0.250000 0.125000 0.250000 +v 0.750000 0.125000 0.250000 +vt 0.250000 0.250000 +vt 0.750000 0.250000 +vt 0.750000 0.750000 +vt 0.250000 0.750000 +vt 0.750000 0.687500 +vt 0.250000 0.687500 +vt 0.687500 0.250000 +vt 0.687500 0.750000 +vt 0.250000 0.312500 +vt 0.750000 0.312500 +vt 0.312500 0.250000 +vt 0.312500 0.750000 +vn 0.000000 -1.000000 0.000000 +vn 0.000000 1.000000 -0.000000 +vn -0.000000 0.000000 1.000000 +vn -1.000000 -0.000000 -0.000000 +vn 0.000000 -0.000000 -1.000000 +vn 1.000000 0.000000 0.000000 +usemtl Material +s off +f 9/13/7 10/14/7 11/15/7 12/16/7 +f 13/13/8 16/14/8 15/15/8 14/16/8 +f 9/17/9 13/15/9 14/16/9 10/18/9 +f 10/19/10 14/14/10 15/15/10 11/20/10 +f 11/21/11 15/13/11 16/14/11 12/22/11 +f 13/13/12 9/23/12 12/24/12 16/16/12 diff --git a/src/main/resources/assets/mekanism/models/glow_panel.blend b/src/main/resources/assets/mekanism/models/glow_panel.blend index 2393ddbd0..7a32b5c93 100644 Binary files a/src/main/resources/assets/mekanism/models/glow_panel.blend and b/src/main/resources/assets/mekanism/models/glow_panel.blend differ