From 57e5a3d0acc6fd21a777dc8a5b89ce178300b790 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 22 Dec 2015 22:47:29 -0600 Subject: [PATCH] Pylon obj model possibly. item working, tile not so --- .../client/core/handler/ModelHandler.java | 14 ++ .../botania/client/model/IPylonModel.java | 8 +- .../botania/client/model/ModelPylon.java | 125 ++++++++++++++++-- .../botania/client/model/ModelPylonOld.java | 7 +- .../client/render/tile/RenderTilePylon.java | 21 ++- .../botania/common/block/BlockPylon.java | 2 +- .../assets/botania/blockstates/pylon.json | 18 +++ .../assets/botania/models/block/pylon.mtl | 2 + .../botania/{model => models/block}/pylon.obj | 31 +++-- 9 files changed, 187 insertions(+), 41 deletions(-) create mode 100644 src/main/resources/assets/botania/blockstates/pylon.json create mode 100644 src/main/resources/assets/botania/models/block/pylon.mtl rename src/main/resources/assets/botania/{model => models/block}/pylon.obj (99%) diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 6c05414a8..0b2f7318a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -13,18 +13,22 @@ import net.minecraft.item.Item; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; +import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.fml.common.registry.GameData; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; import vazkii.botania.common.block.decor.slabs.BlockModSlab; import vazkii.botania.common.item.ItemGaiaHead; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibMisc; import java.util.List; +import java.util.Locale; public final class ModelHandler { @@ -32,6 +36,8 @@ public final class ModelHandler { // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free). // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files public static void registerModels() { + OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); + /** Custom statemappers **/ registerStateMappers(); @@ -47,6 +53,7 @@ public final class ModelHandler { registerPanes(); registerItemModel(ModBlocks.manaGlass); registerItemModel(ModBlocks.elfGlass); + registerPylons(); /** Normal Items **/ registerItemModel(ModItems.lexicon); @@ -200,6 +207,13 @@ public final class ModelHandler { } + private static void registerPylons() { + Item item = Item.getItemFromBlock(ModBlocks.pylon); + ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation("botania:pylon", "variant=mana")); + ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation("botania:pylon", "variant=natura")); + ModelLoader.setCustomModelResourceLocation(item, 2, new ModelResourceLocation("botania:pylon", "variant=gaia")); + } + private static void registerItemModel(Block b) { registerItemModel(Item.getItemFromBlock(b)); } diff --git a/src/main/java/vazkii/botania/client/model/IPylonModel.java b/src/main/java/vazkii/botania/client/model/IPylonModel.java index c795092a5..1b0801004 100644 --- a/src/main/java/vazkii/botania/client/model/IPylonModel.java +++ b/src/main/java/vazkii/botania/client/model/IPylonModel.java @@ -10,10 +10,12 @@ */ package vazkii.botania.client.model; +import vazkii.botania.api.state.enums.PylonVariant; + public interface IPylonModel { - public void renderCrystal(); - public void renderRing(); - public void renderGems(); + public void renderCrystal(PylonVariant variant); + public void renderRing(PylonVariant variant); + public void renderGems(PylonVariant variant); } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index ff5a29736..a7839b377 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -10,30 +10,133 @@ */ package vazkii.botania.client.model; +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.crash.CrashReport; +import net.minecraft.util.EnumFacing; +import net.minecraft.util.ReportedException; import net.minecraft.util.ResourceLocation; -import vazkii.botania.client.lib.LibResources; +import net.minecraftforge.client.model.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.pipeline.LightUtil; +import org.lwjgl.opengl.GL11; +import vazkii.botania.api.state.enums.PylonVariant; + +import java.io.IOException; +import java.util.List; +import java.util.Set; public class ModelPylon implements IPylonModel { - //private IModelCustom model; - // todo 1.8 restore + private IFlexibleBakedModel manaCrystal; + private IFlexibleBakedModel manaRingsAndPanes; + private IFlexibleBakedModel manaGems; + + private IFlexibleBakedModel naturaCrystal; + private IFlexibleBakedModel naturaRingsAndPanes; + private IFlexibleBakedModel naturaGems; + + private IFlexibleBakedModel gaiaCrystal; + private IFlexibleBakedModel gaiaRingsAndPanes; + private IFlexibleBakedModel gaiaGems; + + private static final Function TEXTUREGETTER = new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation input) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + } + }; + + private static final Set GROUP_NAMES = ImmutableSet.of("Crystal", "CrystalRing", "Ring_Panel01", "Ring_Panel02", + "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + public ModelPylon() { - //model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); + try { + OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:model/block/pylon.obj"))); + + OBJModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon"))); + OBJModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon1"))); + OBJModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:models/pylon2"))); + + // Turn off all except "Crystal" + manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Crystal"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + + // Turn off all except "CrystalRing", and "Ring_Panel0x" + manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("CrystalRing", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + + // Turn off all except "Ring_Gem0x" + manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.copyOf(Sets.difference(GROUP_NAMES, ImmutableSet.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"))), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + } catch (IOException e) { + throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e)); + } } @Override - public void renderCrystal() { - //model.renderPart("Crystal"); + public void renderCrystal(PylonVariant variant) { + switch (variant) { + case MANA: renderModel(manaCrystal); break; + case NATURA: renderModel(naturaCrystal); break; + case GAIA: renderModel(gaiaCrystal); break; + } } @Override - public void renderRing() { - //model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + public void renderRing(PylonVariant variant) { + switch (variant) { + case MANA: renderModel(manaRingsAndPanes); break; + case NATURA: renderModel(naturaRingsAndPanes); break; + case GAIA: renderModel(gaiaRingsAndPanes); break; + } } @Override - public void renderGems() { - //for(int i = 1; i < 5; i++) - //model.renderPart("Ring_Gem0" + i); + public void renderGems(PylonVariant variant) { + switch (variant) { + case MANA: renderModel(manaGems); break; + case NATURA: renderModel(naturaGems); break; + case GAIA: renderModel(gaiaGems); break; + } + } + + private void renderModel(IFlexibleBakedModel model) + { + renderModel(model, -1); + } + + private void renderModel(IFlexibleBakedModel model, int color) + { + Tessellator tessellator = Tessellator.getInstance(); + WorldRenderer worldrenderer = tessellator.getWorldRenderer(); + worldrenderer.begin(GL11.GL_QUADS, model.getFormat()); + + for (EnumFacing enumfacing : EnumFacing.values()) + { + this.renderQuads(worldrenderer, model.getFaceQuads(enumfacing), color); + } + + this.renderQuads(worldrenderer, model.getGeneralQuads(), color); + tessellator.draw(); + } + + private void renderQuads(WorldRenderer renderer, List quads, int color) + { + for (BakedQuad bakedquad : quads) + LightUtil.renderQuadColor(renderer, bakedquad, color); } } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java index c600dd261..a6e664923 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonOld.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonOld.java @@ -12,6 +12,7 @@ package vazkii.botania.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import vazkii.botania.api.state.enums.PylonVariant; public class ModelPylonOld extends ModelBase implements IPylonModel { @@ -119,7 +120,7 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderCrystal() { + public void renderCrystal(PylonVariant variant) { float f = 1F / 16F; crystal1.render(f); crystal2.render(f); @@ -132,7 +133,7 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderRing() { + public void renderRing(PylonVariant variant) { float f = 1F / 16F; outside1.render(f); outside2.render(f); @@ -151,7 +152,7 @@ public class ModelPylonOld extends ModelBase implements IPylonModel { } @Override - public void renderGems() { + public void renderGems(PylonVariant variant) { // NO-OP } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index adc174e65..02302c602 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -15,13 +15,18 @@ import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MultiblockRenderHandler; import vazkii.botania.client.core.helper.ShaderHelper; @@ -57,14 +62,16 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); float a = MultiblockRenderHandler.rendering ? 0.6F : 1F; GlStateManager.color(1F, 1F, 1F, a); + PylonVariant variant = null; if(tileentity.getWorld() != null) { - green = tileentity.getBlockMetadata() == 1; - pink = tileentity.getBlockMetadata() == 2; + variant = ((PylonVariant) tileentity.getWorld().getBlockState(tileentity.getPos()).getValue(BotaniaStateProps.PYLON_VARIANT)); + green = variant == PylonVariant.NATURA; + pink = variant == PylonVariant.GAIA; } if(ConfigHandler.oldPylonModel) Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld); - else Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePink : green ? textureGreen : texture); + else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks); @@ -88,9 +95,9 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { if(!ConfigHandler.oldPylonModel) GlStateManager.translate(-0.5F, 0F, 0.5F); - model.renderRing(); + model.renderRing(variant); GlStateManager.translate(0D, Math.sin(worldTime / 20D) / 20 - 0.025, 0D); - model.renderGems(); + model.renderGems(variant); GlStateManager.popMatrix(); } @@ -106,7 +113,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { GlStateManager.disableCull(); - model.renderCrystal(); + model.renderCrystal(variant); GlStateManager.color(1F, 1F, 1F, a); if(!ShaderHelper.useShaders()) { @@ -125,7 +132,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer { else GlStateManager.translate(0F, -0.09F, 0F); ShaderHelper.useShader(ShaderHelper.pylonGlow); - model.renderCrystal(); + model.renderCrystal(variant); ShaderHelper.releaseShader(); GlStateManager.enableAlpha(); diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 65fe7c48d..5100cf507 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -105,7 +105,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu @Override public int getRenderType() { - return LibRenderIDs.idPylon; + return 2; } @Override diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json new file mode 100644 index 000000000..d182779bd --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:pylon.obj", + "transform": "forge:default-block", + "custom": { + "flip-v": true + } + }, + "variants": { + "variant": { + "mana": { "textures": { "#pylon": "botania:model/pylon" } }, + "natura": { "textures": { "#pylon": "botania:model/pylon1" } }, + "gaia": { "textures": { "#pylon": "botania:model/pylon2" } } + }, + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/pylon.mtl b/src/main/resources/assets/botania/models/block/pylon.mtl new file mode 100644 index 000000000..06fc90146 --- /dev/null +++ b/src/main/resources/assets/botania/models/block/pylon.mtl @@ -0,0 +1,2 @@ +newmtl pylon +map_Kd botania:pylon \ No newline at end of file diff --git a/src/main/resources/assets/botania/model/pylon.obj b/src/main/resources/assets/botania/models/block/pylon.obj similarity index 99% rename from src/main/resources/assets/botania/model/pylon.obj rename to src/main/resources/assets/botania/models/block/pylon.obj index dcf1bbe84..825af52a2 100644 --- a/src/main/resources/assets/botania/model/pylon.obj +++ b/src/main/resources/assets/botania/models/block/pylon.obj @@ -4,7 +4,7 @@ # # object Crystal # - +mtllib pylon.mtl v 0.5000 2.0000 -0.5000 v 0.9174 1.3116 -0.5000 v 0.5000 1.3116 -0.9174 @@ -40,7 +40,7 @@ vt 0.1875 0.3594 0.5000 # 14 texture coords g Crystal -s off +usemtl pylon f 1/1/1 2/2/1 3/3/1 f 1/4/2 3/5/2 4/6/2 f 1/1/3 4/7/3 5/3/3 @@ -100,22 +100,21 @@ vt 0.0234 0.7813 0.5817 # 24 texture coords g Ring_Panel03 -s 2 f 7/15/9 8/16/9 9/17/9 -f 9/17/9 10/18/9 7/15/9 -s 4 +f 9/17/9 10/18/9 7/15/9 + f 11/19/10 12/20/10 13/21/10 f 13/21/10 14/22/10 11/19/10 -s 8 + f 7/23/11 10/24/11 12/25/11 -f 12/25/11 11/26/11 7/23/11 -s 16 +f 12/25/11 11/26/11 7/23/11 + f 10/27/12 9/28/12 13/29/12 f 13/29/12 12/30/12 10/27/12 -s 32 + f 9/31/13 8/32/13 14/33/13 f 14/33/13 13/34/13 9/31/13 -s 64 + f 8/35/14 7/36/14 11/37/14 f 11/37/14 14/38/14 8/35/14 # 12 faces @@ -169,22 +168,22 @@ vt 0.0625 0.5234 0.5741 # 24 texture coords g Ring_Gem03 -s 2 + f 15/39/15 16/40/15 17/41/15 f 17/41/15 18/42/15 15/39/15 -s 4 + f 19/43/16 20/44/16 21/45/16 f 21/45/16 22/46/16 19/43/16 -s 8 + f 15/47/17 18/48/17 20/49/17 f 20/49/17 19/50/17 15/47/17 -s 16 + f 18/51/18 17/52/18 21/53/18 f 21/53/18 20/54/18 18/51/18 -s 32 + f 17/55/19 16/56/19 22/57/19 f 22/57/19 21/58/19 17/55/19 -s 64 + f 16/59/20 15/60/20 19/61/20 f 19/61/20 22/62/20 16/59/20 # 12 faces