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 86f3ea394..a93500f4a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -17,16 +17,22 @@ import net.minecraft.block.BlockWall; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ItemMeshDefinition; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMapperBase; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; import net.minecraft.util.IStringSerializable; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.model.ISmartItemModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; @@ -125,9 +131,7 @@ import java.util.Locale; public final class ModelHandler { - // Very hardocode-y right now. Will be refactored after things work. - // 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 + // todo reorganize, alphabetize public static void registerModels() { ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE); OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT)); @@ -416,9 +420,10 @@ public final class ModelHandler { registerItemModel(ModBlocks.spawnerClaw); registerItemModel(ModBlocks.turntable); + // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler + registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length); - // Item models which all use the same base model and recolored by render layer registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length); registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length); @@ -427,7 +432,6 @@ public final class ModelHandler { // Blocks which share models with their item, and have only one variant to switch over registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant"); - registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant"); registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant"); @@ -564,7 +568,7 @@ public final class ModelHandler { registerItemModel(flightTiara); registerItemModel(divaCharm); registerItemModel(manaMirror); - // magnet ring and greater version - custom mesher + registerItemModel(manaInkwell); registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES); registerItemModelAllMeta(laputaShard, 20); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java index 4159d6acf..c2512a739 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderEventHandler.java @@ -11,6 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import org.apache.commons.lang3.text.WordUtils; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; +import vazkii.botania.client.model.PylonItemModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; import vazkii.botania.common.item.ItemSparkUpgrade; @@ -65,11 +66,13 @@ public class RenderEventHandler { evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE); evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE); evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE); + + // Pylon item model + evt.modelRegistry.putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel()); } @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre evt) { - System.out.println("CALLING TEXTURE STITCH"); alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks"); lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks"); lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks"); diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 2e42a52a1..503de6719 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -16,6 +16,7 @@ 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.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -63,32 +64,31 @@ public class ModelPylon implements IPylonModel { public ModelPylon() { try { + // Load the OBJ OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + // Apply the texture and flip the v's of the model IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); - // Turn off all except "Crystal" - manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // All groups are off by default + // (OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group) - // Turn off all except "Crystal_Ring", and "Ring_Panel0x" - manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // Turn on "Crystal" + manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - // Turn off all except "Ring_Gem0x" - manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); - gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02", - "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + // Turn on "Crystal_Ring", and "Ring_Panel0x" + manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + + // Turn on "Ring_Gem0x" + manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER); + gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.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)); } @@ -105,20 +105,24 @@ public class ModelPylon implements IPylonModel { @Override public void renderRing(PylonVariant variant) { + GlStateManager.disableLighting(); switch (variant) { case MANA: renderModel(manaRingsAndPanes); break; case NATURA: renderModel(naturaRingsAndPanes); break; case GAIA: renderModel(gaiaRingsAndPanes); break; } + GlStateManager.enableLighting(); } @Override public void renderGems(PylonVariant variant) { + GlStateManager.disableLighting(); switch (variant) { case MANA: renderModel(manaGems); break; case NATURA: renderModel(naturaGems); break; case GAIA: renderModel(gaiaGems); break; } + GlStateManager.enableLighting(); } private void renderModel(IFlexibleBakedModel model) diff --git a/src/main/java/vazkii/botania/client/model/PylonItemModel.java b/src/main/java/vazkii/botania/client/model/PylonItemModel.java new file mode 100644 index 000000000..783fbf5e2 --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/PylonItemModel.java @@ -0,0 +1,132 @@ +package vazkii.botania.client.model; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +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.Attributes; +import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IPerspectiveAwareModel; +import net.minecraftforge.client.model.ISmartItemModel; +import net.minecraftforge.client.model.TRSRTransformation; +import net.minecraftforge.client.model.obj.OBJLoader; +import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.fml.common.FMLLog; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.http.annotation.Immutable; +import org.apache.logging.log4j.Level; + +import javax.vecmath.Matrix4f; +import javax.vecmath.Vector3f; +import java.io.IOException; +import java.util.List; + +public class PylonItemModel implements ISmartItemModel { + + private IBakedModel mana; + private IBakedModel natura; + private IBakedModel gaia; + private boolean cached = false; + + @Override + public IBakedModel handleItemState(ItemStack stack) { + if (!cached) { + cacheModels(); + } + + switch (stack.getItemDamage()) { + case 2: return gaia; + case 1: return natura; + case 0: return mana; + default: + return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + } + } + + private void cacheModels() { + // Load the OBJ + OBJModel model = null; + try { + model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj"))); + } catch (IOException e) { + FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model"); + mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + gaia = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(); + cached = true; + return; + } + + // Apply the texture and flip the v's of the model + IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true")); + IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true")); + IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true")); + + // All groups are off by default + // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group + + final Function textureGetter = new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation input) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + } + }; + + ImmutableList standardGroups = ImmutableList.of("Crystal", "Crystal_Ring", + "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04", + "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + + mana = new PerspectiveWrapper(manaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + // Natura model is just the crystal + natura = new PerspectiveWrapper(naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + gaia = new PerspectiveWrapper(gaiaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter)); + cached = true; + } + + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); } + @Override public List getGeneralQuads() { return ImmutableList.of(); } + @Override public boolean isAmbientOcclusion() { return false; } + @Override public boolean isGui3d() { return true; } + @Override public boolean isBuiltInRenderer() { return false; } + @Override public TextureAtlasSprite getParticleTexture() { return null; } + @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + + // Wrapper to transform the model before rendering it, so it looks right in the inventory + private class PerspectiveWrapper implements IPerspectiveAwareModel { + + private final IFlexibleBakedModel parent; + + public PerspectiveWrapper(IBakedModel pylonModel) { + this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT); + } + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { + switch(cameraTransformType) { + case FIRST_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix()); + case GUI: return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix()); + case THIRD_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix()); + default: return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix()); + } + } + + @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; } + @Override public List getFaceQuads(EnumFacing p_177551_1_) { return parent.getFaceQuads(p_177551_1_); } + @Override public List getGeneralQuads() { return parent.getGeneralQuads(); } + @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); } + @Override public boolean isGui3d() { return parent.isGui3d(); } + @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); } + @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } + @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } + } +} diff --git a/src/main/resources/assets/botania/blockstates/pylon.json b/src/main/resources/assets/botania/blockstates/pylon.json index d182779bd..4b99230ed 100644 --- a/src/main/resources/assets/botania/blockstates/pylon.json +++ b/src/main/resources/assets/botania/blockstates/pylon.json @@ -12,7 +12,6 @@ "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/item/manaInkwell.json b/src/main/resources/assets/botania/models/item/manaInkwell.json new file mode 100644 index 000000000..cca65a137 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaInkwell.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/manaInkwell" + } +} \ No newline at end of file