diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index ce32836a6..f07bd1a8c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -8,34 +8,21 @@ */ package vazkii.botania.client.core.handler; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.launchwrapper.Launch; import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import org.lwjgl.BufferUtils; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; -import vazkii.botania.common.Botania; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; -import java.nio.IntBuffer; +import vazkii.botania.common.lib.LibMisc; public class MiscellaneousIcons { @@ -98,7 +85,10 @@ public class MiscellaneousIcons { evt.getModelRegistry().putObject(new ModelResourceLocation("botania:platform", "normal"), new PlatformModel()); // Lexicon - evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon", "inventory"), new LexiconModel()); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon_3d_default", "inventory"), + new LexiconModel(new ModelResourceLocation("botania:lexicon_default", "inventory"))); + evt.getModelRegistry().putObject(new ModelResourceLocation("botania:lexicon_3d_elven", "inventory"), + new LexiconModel(new ModelResourceLocation("botania:lexicon_elven", "inventory"))); // Mana Blaster ModelResourceLocation key = new ModelResourceLocation("botania:manaGun", "inventory"); diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index fd73cbba6..1b2b573f2 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -17,18 +17,21 @@ import javax.annotation.Nonnull; import javax.vecmath.Matrix4f; import java.util.List; -@SuppressWarnings("deprecation") public class LexiconModel implements IBakedModel { + private final ModelResourceLocation path2D; - private static final ModelResourceLocation path = new ModelResourceLocation("botania:lexicon_default", "inventory"); + public LexiconModel(ModelResourceLocation path) { + this.path2D = path; + } + @Nonnull @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) { - IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path); if((cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_RIGHT_HAND || cameraTransformType == ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND) && ConfigHandler.lexicon3dModel) return Pair.of(this, null); + IBakedModel original = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getModel(path2D); return original.handlePerspective(cameraTransformType); } @@ -37,6 +40,6 @@ public class LexiconModel implements IBakedModel { @Override public boolean isGui3d() { return false; } @Override public boolean isBuiltInRenderer() { return false; } @Nonnull @Override public TextureAtlasSprite getParticleTexture() { return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("botania:items/lexicon"); } - @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + @SuppressWarnings("deprecation") @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } @Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 365c3babe..40da959ee 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -263,8 +263,16 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelBakery.registerItemVariants(this, new ModelResourceLocation("botania:lexicon_default", "inventory")); - ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation(getRegistryName(), "inventory")); + // Load and bake the 2D models + ModelBakery.registerItemVariants(this, + new ModelResourceLocation("botania:lexicon_default", "inventory"), + new ModelResourceLocation("botania:lexicon_elven", "inventory")); + + ModelResourceLocation default3dPath = new ModelResourceLocation("botania:lexicon_3d_default", "inventory"); + ModelResourceLocation elven3dPath = new ModelResourceLocation("botania:lexicon_3d_elven", "inventory"); + + // smart model will dispatch between 2d/3d appropriately, see LexiconModel + ModelLoader.setCustomMeshDefinition(this, stack -> isElvenItem(stack) ? elven3dPath : default3dPath); } } diff --git a/src/main/resources/assets/botania/models/item/lexicon_default.json b/src/main/resources/assets/botania/models/item/lexicon_default.json index 464dc1a78..6758a056a 100644 --- a/src/main/resources/assets/botania/models/item/lexicon_default.json +++ b/src/main/resources/assets/botania/models/item/lexicon_default.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lexicon" + "layer0": "botania:items/lexicon0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lexicon_elven.json b/src/main/resources/assets/botania/models/item/lexicon_elven.json new file mode 100644 index 000000000..5bf142c54 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lexicon_elven.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lexicon1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/items/lexicon.png b/src/main/resources/assets/botania/textures/items/lexicon0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lexicon.png rename to src/main/resources/assets/botania/textures/items/lexicon0.png