From 41fabac3c93f4d69274f8f26bdc4c1b7a18f33f0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 11 Jan 2020 13:43:17 -0600 Subject: [PATCH] Begin deprecation of IconHelper, moving a bunch of things that used it to their own generated baked models --- .gitignore | 4 - .../handler/ContributorFancinessHandler.java | 27 ++-- .../client/core/handler/LayerTerraHelmet.java | 17 +-- .../core/handler/MiscellaneousIcons.java | 121 ++++++++-------- .../render/entity/RenderBabylonWeapon.java | 39 +++--- .../render/tile/RenderTileTinyPotato.java | 129 +++++++++--------- .../armor/terrasteel/ItemTerrasteelHelm.java | 31 +++-- .../equipment/bauble/ItemBloodPendant.java | 37 ++--- .../equipment/bauble/ItemCloudPendant.java | 14 +- .../equipment/bauble/ItemFlightTiara.java | 79 +++++------ .../item/equipment/bauble/ItemIcePendant.java | 14 +- .../item/equipment/bauble/ItemItemFinder.java | 15 +- .../equipment/bauble/ItemLavaPendant.java | 14 +- .../bauble/ItemSuperLavaPendant.java | 14 +- .../item/equipment/bauble/ItemThirdEye.java | 16 +-- .../models/icon/blood_pendant_chain.json | 6 + .../models/icon/blood_pendant_gem.json | 6 + .../models/icon/cloud_pendant_gem.json | 6 + .../botania/models/icon/gate_weapon_0.json | 6 + .../botania/models/icon/gate_weapon_1.json | 6 + .../botania/models/icon/gate_weapon_10.json | 6 + .../botania/models/icon/gate_weapon_11.json | 6 + .../botania/models/icon/gate_weapon_2.json | 6 + .../botania/models/icon/gate_weapon_3.json | 6 + .../botania/models/icon/gate_weapon_4.json | 6 + .../botania/models/icon/gate_weapon_5.json | 6 + .../botania/models/icon/gate_weapon_6.json | 6 + .../botania/models/icon/gate_weapon_7.json | 6 + .../botania/models/icon/gate_weapon_8.json | 6 + .../botania/models/icon/gate_weapon_9.json | 6 + .../assets/botania/models/icon/goldfish.json | 6 + .../botania/models/icon/ice_pendant_gem.json | 6 + .../botania/models/icon/itemfinder_gem.json | 6 + .../botania/models/icon/lava_pendant_gem.json | 6 + .../assets/botania/models/icon/nerfbat.json | 6 + .../assets/botania/models/icon/phiflower.json | 6 + .../models/icon/super_cloud_pendant_gem.json | 6 + .../models/icon/super_lava_pendant_gem.json | 6 + .../botania/models/icon/third_eye_0.json | 6 + .../botania/models/icon/third_eye_1.json | 6 + .../botania/models/icon/third_eye_2.json | 6 + .../botania/models/icon/tiara_wing_1.json | 6 + .../botania/models/icon/tiara_wing_2.json | 6 + .../botania/models/icon/tiara_wing_3.json | 6 + .../botania/models/icon/tiara_wing_4.json | 6 + .../botania/models/icon/tiara_wing_5.json | 6 + .../botania/models/icon/tiara_wing_6.json | 6 + .../botania/models/icon/tiara_wing_7.json | 6 + .../botania/models/icon/tiara_wing_8.json | 6 + .../botania/models/icon/tiara_wing_9.json | 6 + .../botania/models/icon/will_flame.json | 6 + 51 files changed, 495 insertions(+), 292 deletions(-) create mode 100644 src/main/resources/assets/botania/models/icon/blood_pendant_chain.json create mode 100644 src/main/resources/assets/botania/models/icon/blood_pendant_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/cloud_pendant_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_0.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_1.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_10.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_11.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_2.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_3.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_4.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_5.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_6.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_7.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_8.json create mode 100644 src/main/resources/assets/botania/models/icon/gate_weapon_9.json create mode 100644 src/main/resources/assets/botania/models/icon/goldfish.json create mode 100644 src/main/resources/assets/botania/models/icon/ice_pendant_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/itemfinder_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/lava_pendant_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/nerfbat.json create mode 100644 src/main/resources/assets/botania/models/icon/phiflower.json create mode 100644 src/main/resources/assets/botania/models/icon/super_cloud_pendant_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/super_lava_pendant_gem.json create mode 100644 src/main/resources/assets/botania/models/icon/third_eye_0.json create mode 100644 src/main/resources/assets/botania/models/icon/third_eye_1.json create mode 100644 src/main/resources/assets/botania/models/icon/third_eye_2.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_1.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_2.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_3.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_4.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_5.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_6.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_7.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_8.json create mode 100644 src/main/resources/assets/botania/models/icon/tiara_wing_9.json create mode 100644 src/main/resources/assets/botania/models/icon/will_flame.json diff --git a/.gitignore b/.gitignore index b206c5f41..f0d312268 100644 --- a/.gitignore +++ b/.gitignore @@ -37,10 +37,6 @@ Thumbs.db .AppleDouble .LSOverride -# Icon must end with two \r -Icon - - # Thumbnails ._* diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index 94abd7c0c..1c45b44ec 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -15,6 +15,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; @@ -79,7 +80,7 @@ public final class ContributorFancinessHandler extends LayerRenderer manaLevelTriggerIcons = new EnumMap<>(TriggerManaLevel.State.class); - public final TextureAtlasSprite[] tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; - public final TextureAtlasSprite[] thirdEyeLayers = new TextureAtlasSprite[3]; + public final IBakedModel[] tiaraWingIcons = new IBakedModel[ItemFlightTiara.WING_TYPES]; + public final IBakedModel[] thirdEyeLayers = new IBakedModel[3]; - // begin dank_memes public TextureAtlasSprite tailIcon = null; - public TextureAtlasSprite phiFlowerIcon = null; - public TextureAtlasSprite goldfishIcon = null; - public TextureAtlasSprite nerfBatIcon = null; - // end dank_memes - // Icons for baubles that don't render their own model on the player - public TextureAtlasSprite + public IBakedModel goldfishModel, + phiFlowerModel, + nerfBatModel, bloodPendantChain, bloodPendantGem, snowflakePendantGem, @@ -82,7 +77,33 @@ public class MiscellaneousIcons { pyroclastGem, crimsonGem, cirrusGem, - nimbusGem; + nimbusGem, + terrasteelHelmWillModel; + + public final IBakedModel[] kingKeyWeaponModels = new IBakedModel[ItemKingKey.WEAPON_TYPES]; + + @SubscribeEvent + public void onModelRegister(ModelRegistryEvent evt) { + ModelLoader.addSpecialModel(prefix("icon/goldfish")); + ModelLoader.addSpecialModel(prefix("icon/phiflower")); + ModelLoader.addSpecialModel(prefix("icon/nerfbat")); + for (int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) { + ModelLoader.addSpecialModel(prefix("icon/gate_weapon_" + i)); + } + ModelLoader.addSpecialModel(prefix("icon/will_flame")); + for (int i = 0; i < thirdEyeLayers.length; i++) { + ModelLoader.addSpecialModel(prefix("icon/third_eye_" + i)); + } + ModelLoader.addSpecialModel(prefix("icon/lava_pendant_gem")); + ModelLoader.addSpecialModel(prefix("icon/super_lava_pendant_gem")); + ModelLoader.addSpecialModel(prefix("icon/itemfinder_gem")); + ModelLoader.addSpecialModel(prefix("icon/cloud_pendant_gem")); + ModelLoader.addSpecialModel(prefix("icon/super_cloud_pendant_gem")); + ModelLoader.addSpecialModel(prefix("icon/ice_pendant_gem")); + for (int i = 0; i < tiaraWingIcons.length; i++) { + ModelLoader.addSpecialModel(prefix("icon/tiara_wing_" + (i + 1))); + } + } @SubscribeEvent public void onModelBake(ModelBakeEvent evt) { @@ -132,6 +153,28 @@ public class MiscellaneousIcons { RenderTileCorporeaCrystalCube.cubeModel = evt.getModelRegistry().get(prefix("block/corporea_crystal_cube_glass")); RenderTilePump.headModel = evt.getModelRegistry().get(prefix("block/mana_pump_head")); + + // Icons + goldfishModel = evt.getModelRegistry().get(prefix("icon/goldfish")); + phiFlowerModel = evt.getModelRegistry().get(prefix("icon/phiflower")); + nerfBatModel = evt.getModelRegistry().get(prefix("icon/nerfbat")); + for (int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) { + kingKeyWeaponModels[i] = evt.getModelRegistry().get(prefix("icon/gate_weapon_" + i)); + } + terrasteelHelmWillModel = evt.getModelRegistry().get(prefix("icon/will_flame")); + for (int i = 0; i < thirdEyeLayers.length; i++) { + thirdEyeLayers[i] = evt.getModelRegistry().get(prefix("icon/third_eye_" + i)); + } + pyroclastGem = evt.getModelRegistry().get(prefix("icon/lava_pendant_gem")); + crimsonGem = evt.getModelRegistry().get(prefix("icon/super_lava_pendant_gem")); + itemFinderGem = evt.getModelRegistry().get(prefix("icon/itemfinder_gem")); + + cirrusGem = evt.getModelRegistry().get(prefix("icon/cloud_pendant_gem")); + nimbusGem = evt.getModelRegistry().get(prefix("icon/super_cloud_pendant_gem")); + snowflakePendantGem = evt.getModelRegistry().get(prefix("icon/ice_pendant_gem")); + for (int i = 0; i < tiaraWingIcons.length; i++) { + tiaraWingIcons[i] = evt.getModelRegistry().get(prefix("icon/tiara_wing_" + (i + 1))); + } } @SubscribeEvent @@ -161,39 +204,15 @@ public class MiscellaneousIcons { } evt.addSprite(prefix("items/special_tail")); - evt.addSprite(prefix("items/special_phiflower")); - evt.addSprite(prefix("items/special_goldfish")); - evt.addSprite(prefix("items/special_nerfbat")); - - for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) - evt.addSprite(prefix("items/gate_weapon_" + i)); - - for(int i = 0; i < 3; i++) - evt.addSprite(prefix("items/third_eye_" + i)); + /* evt.addSprite(prefix("items/triggers/mana_detector")); evt.addSprite(prefix("items/triggers/rune_altar_can_craft")); - /* for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { register(evt.getMap(), "items/triggers/mana" + WordUtils.capitalizeFully(s.name())); } */ - - for (int i = 0; i < tiaraWingIcons.length; i++) { - evt.addSprite(prefix("items/headpiece_tiara_wing_" + (i + 1))); - } - - evt.addSprite(prefix("items/will_flame")); - - evt.addSprite(prefix("items/pendant_blood_chain")); - evt.addSprite(prefix("items/pendant_blood_gem")); - evt.addSprite(prefix("items/pendant_ice_gem")); - evt.addSprite(prefix("items/headpiece_item_finder_gem")); - evt.addSprite(prefix("items/pendant_lava_gem")); - evt.addSprite(prefix("items/pendant_lava_super_gem")); - evt.addSprite(prefix("items/pendant_cloud_gem")); - evt.addSprite(prefix("items/pendant_cloud_super_gem")); } @SubscribeEvent @@ -222,39 +241,15 @@ public class MiscellaneousIcons { } tailIcon = get(evt.getMap(), "items/special_tail"); - phiFlowerIcon = get(evt.getMap(), "items/special_phiflower"); - goldfishIcon = get(evt.getMap(), "items/special_goldfish"); - nerfBatIcon = get(evt.getMap(), "items/special_nerfbat"); - - for(int i = 0; i < ItemKingKey.WEAPON_TYPES; i++) - kingKeyWeaponIcons[i] = get(evt.getMap(), "items/gate_weapon_" + i); - - for(int i = 0; i < 3; i++) - thirdEyeLayers[i] = get(evt.getMap(), "items/third_eye_" + i); + /* manaDetectorIcon = get(evt.getMap(), "items/triggers/mana_detector"); runeAltarTriggerIcon = get(evt.getMap(), "items/triggers/rune_altar_can_craft"); - /* for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { manaLevelTriggerIcons.put(s, get(evt.getMap(), "items/triggers/mana" + WordUtils.capitalizeFully(s.name()))); } */ - - for (int i = 0; i < tiaraWingIcons.length; i++) { - tiaraWingIcons[i] = get(evt.getMap(), "items/headpiece_tiara_wing_" + (i + 1)); - } - - terrasteelHelmWillIcon = get(evt.getMap(), "items/will_flame"); - - bloodPendantChain = get(evt.getMap(), "items/pendant_blood_chain"); - bloodPendantGem = get(evt.getMap(), "items/pendant_blood_gem"); - snowflakePendantGem = get(evt.getMap(), "items/pendant_ice_gem"); - itemFinderGem = get(evt.getMap(), "items/headpiece_item_finder_gem"); - pyroclastGem = get(evt.getMap(), "items/pendant_lava_gem"); - crimsonGem = get(evt.getMap(), "items/pendant_lava_super_gem"); - cirrusGem = get(evt.getMap(), "items/pendant_cloud_gem"); - nimbusGem = get(evt.getMap(), "items/pendant_cloud_super_gem"); } private TextureAtlasSprite get(AtlasTexture map, String name) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index 000af0c9b..cef783b69 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -10,13 +10,19 @@ */ package vazkii.botania.client.render.entity; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; @@ -39,36 +45,29 @@ public class RenderBabylonWeapon extends EntityRenderer { } @Override - public void doRender(@Nonnull EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { - GlStateManager.pushMatrix(); - GlStateManager.translated(par2, par4, par6); - GlStateManager.rotatef(weapon.getRotation(), 0F, 1F, 0F); + public void render(@Nonnull EntityBabylonWeapon weapon, float yaw, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light) { + ms.push(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(weapon.getRotation())); int live = weapon.getLiveTicks(); int delay = weapon.getDelay(); - float charge = Math.min(10F, Math.max(live, weapon.getChargeTicks()) + par9); + float charge = Math.min(10F, Math.max(live, weapon.getChargeTicks()) + partialTicks); float chargeMul = charge / 10F; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - GlStateManager.pushMatrix(); + ms.push(); float s = 1.5F; - GlStateManager.scalef(s, s, s); + ms.scale(s, s, s); GlStateManager.rotatef(-90F, 0F, 1F, 0F); GlStateManager.rotatef(45F, 0F, 0F, 1F); - TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; GlStateManager.color4f(1F, 1F, 1F, chargeMul); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, 240, 240); GlStateManager.disableLighting(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 16F); - GlStateManager.popMatrix(); + IBakedModel model = MiscellaneousIcons.INSTANCE.kingKeyWeaponModels[weapon.getVariety()]; + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffers.getBuffer(Atlases.getEntityTranslucent()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.DEFAULT_UV); + ms.pop(); GlStateManager.disableCull(); GlStateManager.shadeModel(GL11.GL_SMOOTH); @@ -84,11 +83,11 @@ public class RenderBabylonWeapon extends EntityRenderer { s = chargeMul; if(live > delay) - s -= Math.min(1F, (live - delay + par9) * 0.2F); + s -= Math.min(1F, (live - delay + partialTicks) * 0.2F); s *= 2F; - GlStateManager.scalef(s, s, s); + ms.scale(s, s, s); - GlStateManager.rotatef(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); + GlStateManager.rotatef(charge * 9F + (weapon.ticksExisted + partialTicks) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); tes.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); tes.getBuffer().pos(-1, 0, -1).tex(0, 0).endVertex(); @@ -102,7 +101,7 @@ public class RenderBabylonWeapon extends EntityRenderer { GlStateManager.enableLighting(); GlStateManager.shadeModel(GL11.GL_FLAT); GlStateManager.enableCull(); - GlStateManager.popMatrix(); + ms.pop(); } @Nonnull diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index d153c1a33..df594e694 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -10,15 +10,23 @@ */ package vazkii.botania.client.render.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderTypeLookup; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; @@ -64,7 +72,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { } @Override - public void render(@Nonnull TileTinyPotato potato, double x, double y, double z, float partialTicks, int destroyStage) { + public void render(@Nonnull TileTinyPotato potato, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { if(potato.getBlockState().getBlock() != ModBlocks.tinyPotato) return; @@ -169,7 +177,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { if(stack.isEmpty()) continue; - GlStateManager.pushMatrix(); + ms.push(); Direction side = Direction.class.getEnumConstants()[i]; if(side.getAxis() != Axis.Y) { float sideAngle = side.getHorizontalAngle() - potatoFacing.getHorizontalAngle(); @@ -182,92 +190,92 @@ public class RenderTileTinyPotato extends TileEntityRenderer { switch(side) { case UP: if(mySon) - GlStateManager.translatef(0F, 0.6F, 0.5F); + ms.translate(0F, 0.6F, 0.5F); else if(block) - GlStateManager.translatef(0F, 0.3F, 0.5F); - GlStateManager.translatef(0F, -0.5F, -0.4F); + ms.translate(0F, 0.3F, 0.5F); + ms.translate(0F, -0.5F, -0.4F); break; case DOWN: - GlStateManager.translatef(0, -2.3F, -0.88F); + ms.translate(0, -2.3F, -0.88F); if(mySon) - GlStateManager.translatef(0, .65F, 0.6F); + ms.translate(0, .65F, 0.6F); else if(block) - GlStateManager.translatef(0, 1, 0.6F); + ms.translate(0, 1, 0.6F); break; case NORTH: - GlStateManager.translatef(0, -1.9F, 0.02F); + ms.translate(0, -1.9F, 0.02F); if(mySon) - GlStateManager.translatef(0, 1, 0.6F); + ms.translate(0, 1, 0.6F); else if(block) - GlStateManager.translatef(0, 1, 0.6F); + ms.translate(0, 1, 0.6F); break; case SOUTH: - GlStateManager.translatef(0, -1.6F, -0.89F); + ms.translate(0, -1.6F, -0.89F); if(mySon) - GlStateManager.translatef(0, 1.4F, 0.5F); + ms.translate(0, 1.4F, 0.5F); else if(block) - GlStateManager.translatef(0, 1.0F, 0.5F); + ms.translate(0, 1.0F, 0.5F); break; case EAST: if(mySon) - GlStateManager.translatef(-0.4F, 0.65F, 0F); + ms.translate(-0.4F, 0.65F, 0F); else if(block) - GlStateManager.translatef(-0.4F, 0.8F, 0F); + ms.translate(-0.4F, 0.8F, 0F); else GlStateManager.rotatef(-90F, 0F, 1F, 0F); - GlStateManager.translatef(-0.3F, -1.9F, 0.04F); + ms.translate(-0.3F, -1.9F, 0.04F); break; case WEST: if(mySon) - GlStateManager.translatef(1F, 0.65F, 1F); + ms.translate(1F, 0.65F, 1F); else if(block) - GlStateManager.translatef(1F, 0.8F, 1F); + ms.translate(1F, 0.8F, 1F); else GlStateManager.rotatef(-90F, 0F, 1F, 0F); - GlStateManager.translatef(-0.3F, -1.9F, -0.92F); + ms.translate(-0.3F, -1.9F, -0.92F); break; } if (mySon) - GlStateManager.scalef(1.1F, 1.1F, 1.1F); + ms.scale(1.1F, 1.1F, 1.1F); else if(block) - GlStateManager.scalef(0.5F, 0.5F, 0.5F); + ms.scale(0.5F, 0.5F, 0.5F); if(block && side != Direction.NORTH) GlStateManager.rotatef(180F, 0, 1, 0); - renderItem(stack); - GlStateManager.popMatrix(); + renderItem(ms, buffers, light, overlay, stack); + ms.pop(); } - GlStateManager.popMatrix(); + ms.pop(); if (!name.isEmpty()) { ContributorFancinessHandler.firstStart(); float scale = 1F / 4F; - GlStateManager.translatef(0F, 1F, 0F); - GlStateManager.scalef(scale, scale, scale); + ms.translate(0F, 1F, 0F); + ms.scale(scale, scale, scale); if (name.equals("phi") || name.equals("vazkii")) { - GlStateManager.translatef(0.45F, 0F, 0.4F); - GlStateManager.rotatef(90F, 0F, 1F, 0F); - GlStateManager.rotatef(20F, 1F, 0F, 1F); - renderIcon(MiscellaneousIcons.INSTANCE.phiFlowerIcon); + ms.translate(0.45F, 0F, 0.4F); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.multiply(new Vector3f(1, 0, 1).getDegreesQuaternion(20)); + renderModel(ms, buffers, light, overlay, MiscellaneousIcons.INSTANCE.phiFlowerModel); if (name.equals("vazkii")) { - GlStateManager.rotatef(-20F, 1F, 0F, 1F); - GlStateManager.scalef(1.25F, 1.25F, 1.25F); - GlStateManager.rotatef(180F, 0F, 0F, 1F); - GlStateManager.translatef(-1.5F, -1.3F, -0.75F); - renderIcon(MiscellaneousIcons.INSTANCE.nerfBatIcon); + ms.multiply(new Vector3f(1, 0, 1).getDegreesQuaternion(-20)); + ms.scale(1.25F, 1.25F, 1.25F); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.translate(-1.5F, -1.3F, -0.75F); + renderModel(ms, buffers, light, overlay, MiscellaneousIcons.INSTANCE.nerfBatModel); } } else if (name.equals("haighyorkie")) { - GlStateManager.scalef(1.25F, 1.25F, 1.25F); - GlStateManager.rotatef(180F, 0F, 0F, 1F); - GlStateManager.rotatef(90F, 0F, 1F, 0F); - GlStateManager.translatef(-0.5F, -1.2F, -0.4F); - renderIcon(MiscellaneousIcons.INSTANCE.goldfishIcon); + ms.scale(1.25F, 1.25F, 1.25F); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.translate(-0.5F, -1.2F, -0.4F); + renderModel(ms, buffers, light, overlay, MiscellaneousIcons.INSTANCE.goldfishModel); } else if (name.equals("martysgames") || name.equals("marty")) { - GlStateManager.scalef(0.7F, 0.7F, 0.7F); - GlStateManager.rotatef(180F, 0F, 0F, 1F); - GlStateManager.translatef(-0.3F, -2.7F, -1.2F); - GlStateManager.rotatef(15F, 0F, 0F, 1F); - renderItem(new ItemStack(ModItems.infiniteFruit, 1).setDisplayName(new StringTextComponent("das boot"))); + ms.scale(0.7F, 0.7F, 0.7F); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.translate(-0.3F, -2.7F, -1.2F); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(15F)); + renderItem(ms, buffers, light, overlay, new ItemStack(ModItems.infiniteFruit, 1).setDisplayName(new StringTextComponent("das boot"))); } else if (name.equals("jibril")) { GlStateManager.scalef(1.5F, 1.5F, 1.5F); GlStateManager.translatef(0F, -0.8F, 0F); @@ -281,23 +289,21 @@ public class RenderTileTinyPotato extends TileEntityRenderer { GlStateManager.rotatef(90F, 0F, 1F, 0F); GlStateManager.translatef(0F, -3F, 0.65F); ItemStack ring = new ItemStack(ModItems.manaRing); - renderItem(ring); + renderItem(ms, buffers, light, overlay, ring); GlStateManager.translatef(0F, 0F, -4F); - renderItem(ring); + renderItem(ms, buffers, light, overlay, ring); GlStateManager.scalef(0.8F, 0.8F, 0.8F); GlStateManager.translatef(1.25F, -1.25F, 2.25F); - mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - renderBlock(Blocks.CAKE); + renderBlock(ms, buffers, light, overlay, Blocks.CAKE); } else if (ContributorFancinessHandler.flowerMap.containsKey(name)) { ItemStack icon = ContributorFancinessHandler.flowerMap.getOrDefault(name, ItemStack.EMPTY); if (!icon.isEmpty()) { - mc.textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotatef(180F, 1F, 0F, 0F); GlStateManager.rotatef(180F, 0F, 1F, 0F); GlStateManager.translatef(0F, 0F, 0F); ShaderHelper.useShader(ShaderHelper.gold); - renderItem(icon); + renderItem(ms, buffers, light, overlay, icon); ShaderHelper.releaseShader(); } } @@ -368,20 +374,17 @@ public class RenderTileTinyPotato extends TileEntityRenderer { GlStateManager.popMatrix(); } - private void renderIcon(TextureAtlasSprite icon) { - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 16F); + private void renderModel(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, IBakedModel model) { + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffers.getBuffer(Atlases.getEntityTranslucent()), null, model, 1, 1, 1, light, overlay); } - private void renderItem(ItemStack stack) { - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.HEAD); + private void renderItem(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, ItemStack stack) { + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.HEAD, light, overlay, ms, buffers); } - private void renderBlock(Block block) { - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(block.getDefaultState(), 1.0F); + private void renderBlock(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, Block block) { + IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(block.getDefaultState()); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getBlockLayer(block.getDefaultState())); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, null, model, 1, 1, 1, light, overlay); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index dae81c022..e93161656 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -10,10 +10,17 @@ */ package vazkii.botania.common.item.equipment.armor.terrasteel; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -98,21 +105,19 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc } @OnlyIn(Dist.CLIENT) - public static void renderOnPlayer(ItemStack stack, PlayerEntity player, float partialTicks) { + public static void renderOnPlayer(MatrixStack ms, IRenderTypeBuffer buffers, int light, ItemStack stack, PlayerEntity player, float partialTicks) { if(hasAnyWill(stack) && !((ItemTerrasteelArmor) stack.getItem()).hasPhantomInk(stack)) { - GlStateManager.pushMatrix(); - float f = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinU(); - float f1 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxU(); - float f2 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMinV(); - float f3 = MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getMaxV(); + ms.push(); AccessoryRenderHelper.translateToHeadLevel(player, partialTicks); - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); - GlStateManager.rotatef(90F, 0F, 1F, 0F); - GlStateManager.rotatef(180F, 1F, 0F, 0F); - GlStateManager.translatef(-0.26F, -1.45F, -0.39F); - GlStateManager.scalef(0.5F, 0.5F, 0.5F); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getWidth(), MiscellaneousIcons.INSTANCE.terrasteelHelmWillIcon.getHeight(), 1F / 16F); - GlStateManager.popMatrix(); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); + ms.translate(-0.26F, -1.45F, -0.39F); + ms.scale(0.5F, 0.5F, 0.5F); + IBakedModel model = MiscellaneousIcons.INSTANCE.terrasteelHelmWillModel; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + ms.pop(); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 9f1b868b9..035c1c35e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -13,10 +13,15 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -116,28 +121,24 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override @OnlyIn(Dist.CLIENT) public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); AccessoryRenderHelper.rotateIfSneaking(player); boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - GlStateManager.rotatef(180F, 1F, 0F, 0F); - GlStateManager.translatef(-0.26F, -0.4F, armor ? 0.2F : 0.15F); - GlStateManager.scalef(0.5F, 0.5F, 0.5F); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); + ms.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); + ms.scale(0.5F, 0.5F, 0.5F); - for (TextureAtlasSprite icon : new TextureAtlasSprite[]{MiscellaneousIcons.INSTANCE.bloodPendantChain, MiscellaneousIcons.INSTANCE.bloodPendantGem}) { - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 32F); + IBakedModel model = MiscellaneousIcons.INSTANCE.bloodPendantChain; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); - Color color = new Color(Minecraft.getInstance().getItemColors().getColor(stack, 1)); - GlStateManager.color3f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F); - int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY); - } - GlStateManager.color3f(1, 1, 1); + model = MiscellaneousIcons.INSTANCE.bloodPendantGem; + Color color = new Color(Minecraft.getInstance().getItemColors().getColor(stack, 1)); + float r = color.getRed() / 255F; + float g = color.getGreen() / 255F; + float b = color.getBlue() / 255F; + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, r, g, b, 0xF000F0, OverlayTexture.DEFAULT_UV); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index e6e9add59..bf2314df9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -12,12 +12,16 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -72,14 +76,12 @@ public class ItemCloudPendant extends ItemBauble { ms.translate(-0.2F, -0.3F, armor ? 0.2F : 0.15F); ms.scale(0.5F, 0.5F, 0.5F); - TextureAtlasSprite gemIcon = stack.getItem() == ModItems.superCloudPendant + IBakedModel model = stack.getItem() == ModItems.superCloudPendant ? MiscellaneousIcons.INSTANCE.nimbusGem : MiscellaneousIcons.INSTANCE.cirrusGem; - float f = gemIcon.getMinU(); - float f1 = gemIcon.getMaxU(); - float f2 = gemIcon.getMinV(); - float f3 = gemIcon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), 1F / 32F); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } public int getMaxAllowedJumps() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index beb9ff82c..14edefa9f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -13,11 +13,16 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.client.util.ITooltipFlag; @@ -299,8 +304,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { int meta = getVariant(stack); if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) { - TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1]; - Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); + IBakedModel icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1]; boolean flying = ((PlayerEntity) player).abilities.isFlying; @@ -311,17 +315,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { float i = 0.15F; float s = 1F; - GlStateManager.pushMatrix(); - GlStateManager.enableBlend(); - GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color4f(1F, 1F, 1F, 1F); - - int light = 15728880; - int lightmapX = light % 65536; - int lightmapY = light / 65536; - - float lbx = GLX.lastBrightnessX; - float lby = GLX.lastBrightnessY; + ms.push(); + boolean fullbright = false; switch (meta) { case 1: { // Jibril @@ -344,7 +339,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { h = 0.5F; rx = 20F; ry = -(float) ((Math.sin((double) (player.ticksExisted + partialTicks) * (flying ? 0.4F : 0.2F)) + 0.6F) * (flying ? 30F : 5F)); - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY); + fullbright = true; break; } case 5: { // Kuroyukihime @@ -360,7 +355,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { break; } case 7: { // Lyfa - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY); + fullbright = true; h = -0.1F; rz = 0F; ry = -rx; @@ -373,7 +368,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { break; } case 9: { // The One - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lightmapX, lightmapY); + fullbright = true; rz = 180F; rx = 0F; h = 1.1F; @@ -386,43 +381,35 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { float mul = 32F / 20F; s *= mul; - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - float sr = 1F / s; - AccessoryRenderHelper.rotateIfSneaking(player); - GlStateManager.translatef(0F, h, i); + ms.translate(0F, h, i); - GlStateManager.rotatef(rz, 0F, 0F, 1F); - GlStateManager.rotatef(rx, 1F, 0F, 0F); - GlStateManager.rotatef(ry, 0F, 1F, 0F); - GlStateManager.scalef(s, s, s); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 32F); - GlStateManager.scalef(sr, sr, sr); - GlStateManager.rotatef(-ry, 0F, 1F, 0F); - GlStateManager.rotatef(-rx, 1F, 0F, 0F); - GlStateManager.rotatef(-rz, 0F, 0F, 1F); + ms.push(); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rz)); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rx)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ry)); + ms.scale(s, s, s); + + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityTranslucent()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, fullbright ? 0xF000F0 : light, OverlayTexture.DEFAULT_UV); + + ms.pop(); if(meta != 2) { // Sephiroth - GlStateManager.scalef(-1F, 1F, 1F); - GlStateManager.rotatef(rz, 0F, 0F, 1F); - GlStateManager.rotatef(rx, 1F, 0F, 0F); - GlStateManager.rotatef(ry, 0F, 1F, 0F); - GlStateManager.scalef(s, s, s); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 32F); - GlStateManager.scalef(sr, sr, sr); - GlStateManager.rotatef(-ry, 1F, 0F, 0F); - GlStateManager.rotatef(-rx, 1F, 0F, 0F); - GlStateManager.rotatef(-rz, 0F, 0F, 1F); + ms.scale(-1F, 1F, 1F); + ms.push(); + ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rz)); + ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rx)); + ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ry)); + ms.scale(s, s, s); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, fullbright ? 0xF000F0 : light, OverlayTexture.DEFAULT_UV); + ms.pop(); } - GlStateManager.color3f(1F, 1F, 1F); - GlStateManager.popMatrix(); - - GLX.glMultiTexCoord2f(GLX.GL_TEXTURE1, lbx, lby); + ms.pop(); if(meta == 1) renderHalo(player, partialTicks); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index e79d84c85..47d7648a5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -13,13 +13,17 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.enchantment.FrostWalkerEnchantment; import net.minecraft.entity.LivingEntity; @@ -78,12 +82,10 @@ public class ItemIcePendant extends ItemBauble { ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-45F)); ms.scale(0.5F, 0.5F, 0.5F); - TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.snowflakePendantGem; - float f = gemIcon.getMinU(); - float f1 = gemIcon.getMaxU(); - float f2 = gemIcon.getMinV(); - float f3 = gemIcon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), 1F / 32F); + IBakedModel model = MiscellaneousIcons.INSTANCE.snowflakePendantGem; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 1204c71de..fe0e31e41 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -12,12 +12,16 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import it.unimi.dsi.fastutil.ints.IntArrayList; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -74,18 +78,17 @@ public class ItemItemFinder extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.itemFinderGem; - float f = gemIcon.getMinU(); - float f1 = gemIcon.getMaxU(); - float f2 = gemIcon.getMinV(); - float f3 = gemIcon.getMaxV(); boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); AccessoryRenderHelper.translateToHeadLevel(living, partialTicks); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); ms.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F); ms.scale(0.75F, 0.75F, 0.75F); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), 1F / 16F); + + IBakedModel model = MiscellaneousIcons.INSTANCE.itemFinderGem; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } protected void tickClient(ItemStack stack, PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 8c862b17c..f2f90028a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -12,11 +12,15 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -48,11 +52,9 @@ public class ItemLavaPendant extends ItemBauble { ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); ms.translate(-0.5, -0.90, armor ? -0.4 : -0.25); - TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.pyroclastGem; - float f = gemIcon.getMinU(); - float f1 = gemIcon.getMaxU(); - float f2 = gemIcon.getMinV(); - float f3 = gemIcon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), 1F / 32F); + IBakedModel model = MiscellaneousIcons.INSTANCE.pyroclastGem; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index c79741ba1..26d16d1ea 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -12,11 +12,15 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -59,11 +63,9 @@ public class ItemSuperLavaPendant extends ItemBauble { ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); ms.translate(-0.5, -0.90, armor ? -0.4 : -0.25); - TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.crimsonGem; - float f = gemIcon.getMinU(); - float f1 = gemIcon.getMaxU(); - float f2 = gemIcon.getMinV(); - float f3 = gemIcon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), 1F / 32F); + IBakedModel model = MiscellaneousIcons.INSTANCE.crimsonGem; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index f11fb3b32..abdbf0bbc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -12,11 +12,15 @@ package vazkii.botania.common.item.equipment.bauble; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; @@ -72,12 +76,10 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { for(int i = 0; i < 3; i++) { ms.push(); - float width = 1F / 16F; switch (i) { case 0: break; case 1: float scale1 = 0.75F; - width /= 2F; ms.translate(0.15, 0.15, -0.05); double time = ClientTickHandler.total * 0.12; @@ -91,12 +93,10 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { break; } - TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.thirdEyeLayers[i]; - float f = gemIcon.getMinU(); - float f1 = gemIcon.getMaxU(); - float f2 = gemIcon.getMinV(); - float f3 = gemIcon.getMaxV(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), width); + IBakedModel model = MiscellaneousIcons.INSTANCE.thirdEyeLayers[i]; + IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntitySolid()); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() + .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); ms.pop(); } } diff --git a/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json b/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json new file mode 100644 index 000000000..d4d3f0036 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/blood_pendant_chain.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_blood_chain" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json b/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json new file mode 100644 index 000000000..4e8570e07 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/blood_pendant_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_blood_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/cloud_pendant_gem.json b/src/main/resources/assets/botania/models/icon/cloud_pendant_gem.json new file mode 100644 index 000000000..b5135ea25 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/cloud_pendant_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_cloud_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_0.json b/src/main/resources/assets/botania/models/icon/gate_weapon_0.json new file mode 100644 index 000000000..694aebaf2 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_0.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_1.json b/src/main/resources/assets/botania/models/icon/gate_weapon_1.json new file mode 100644 index 000000000..ee1852a07 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_10.json b/src/main/resources/assets/botania/models/icon/gate_weapon_10.json new file mode 100644 index 000000000..d806ebd96 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_10.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_10" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_11.json b/src/main/resources/assets/botania/models/icon/gate_weapon_11.json new file mode 100644 index 000000000..fc1779e32 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_11.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_11" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_2.json b/src/main/resources/assets/botania/models/icon/gate_weapon_2.json new file mode 100644 index 000000000..b36dcdf64 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_3.json b/src/main/resources/assets/botania/models/icon/gate_weapon_3.json new file mode 100644 index 000000000..87de36e7e --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_4.json b/src/main/resources/assets/botania/models/icon/gate_weapon_4.json new file mode 100644 index 000000000..f1a95599e --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_5.json b/src/main/resources/assets/botania/models/icon/gate_weapon_5.json new file mode 100644 index 000000000..cc27949d4 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_6.json b/src/main/resources/assets/botania/models/icon/gate_weapon_6.json new file mode 100644 index 000000000..7f2025fa3 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_7.json b/src/main/resources/assets/botania/models/icon/gate_weapon_7.json new file mode 100644 index 000000000..b791847db --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_8.json b/src/main/resources/assets/botania/models/icon/gate_weapon_8.json new file mode 100644 index 000000000..08dc87c30 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/gate_weapon_9.json b/src/main/resources/assets/botania/models/icon/gate_weapon_9.json new file mode 100644 index 000000000..a8c3786f3 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/gate_weapon_9.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/gate_weapon_9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/goldfish.json b/src/main/resources/assets/botania/models/icon/goldfish.json new file mode 100644 index 000000000..3a43cc2be --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/goldfish.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/special_goldfish" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/ice_pendant_gem.json b/src/main/resources/assets/botania/models/icon/ice_pendant_gem.json new file mode 100644 index 000000000..50d6dc643 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/ice_pendant_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_ice_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/itemfinder_gem.json b/src/main/resources/assets/botania/models/icon/itemfinder_gem.json new file mode 100644 index 000000000..4992e3179 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/itemfinder_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_item_finder_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/lava_pendant_gem.json b/src/main/resources/assets/botania/models/icon/lava_pendant_gem.json new file mode 100644 index 000000000..e1a3d45da --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/lava_pendant_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_lava_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/nerfbat.json b/src/main/resources/assets/botania/models/icon/nerfbat.json new file mode 100644 index 000000000..819d27aed --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/nerfbat.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/special_nerfbat" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/phiflower.json b/src/main/resources/assets/botania/models/icon/phiflower.json new file mode 100644 index 000000000..1fad8ff9e --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/phiflower.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/special_phiflower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/super_cloud_pendant_gem.json b/src/main/resources/assets/botania/models/icon/super_cloud_pendant_gem.json new file mode 100644 index 000000000..d2559bf9b --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/super_cloud_pendant_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_cloud_super_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/super_lava_pendant_gem.json b/src/main/resources/assets/botania/models/icon/super_lava_pendant_gem.json new file mode 100644 index 000000000..72a1fc282 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/super_lava_pendant_gem.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/pendant_lava_super_gem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/third_eye_0.json b/src/main/resources/assets/botania/models/icon/third_eye_0.json new file mode 100644 index 000000000..7289679cd --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/third_eye_0.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/third_eye_0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/third_eye_1.json b/src/main/resources/assets/botania/models/icon/third_eye_1.json new file mode 100644 index 000000000..6eb8cea23 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/third_eye_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/third_eye_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/third_eye_2.json b/src/main/resources/assets/botania/models/icon/third_eye_2.json new file mode 100644 index 000000000..61f958a68 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/third_eye_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/third_eye_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_1.json b/src/main/resources/assets/botania/models/icon/tiara_wing_1.json new file mode 100644 index 000000000..72196f18c --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_1.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_2.json b/src/main/resources/assets/botania/models/icon/tiara_wing_2.json new file mode 100644 index 000000000..e263356c7 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_2.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_3.json b/src/main/resources/assets/botania/models/icon/tiara_wing_3.json new file mode 100644 index 000000000..c0b023f02 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_3.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_4.json b/src/main/resources/assets/botania/models/icon/tiara_wing_4.json new file mode 100644 index 000000000..4ed88111a --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_4.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_5.json b/src/main/resources/assets/botania/models/icon/tiara_wing_5.json new file mode 100644 index 000000000..f590d184f --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_5.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_6.json b/src/main/resources/assets/botania/models/icon/tiara_wing_6.json new file mode 100644 index 000000000..263f66e1b --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_6.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_7.json b/src/main/resources/assets/botania/models/icon/tiara_wing_7.json new file mode 100644 index 000000000..19c9516bd --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_7.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_8.json b/src/main/resources/assets/botania/models/icon/tiara_wing_8.json new file mode 100644 index 000000000..7fc22ac14 --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_8.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/tiara_wing_9.json b/src/main/resources/assets/botania/models/icon/tiara_wing_9.json new file mode 100644 index 000000000..49a49e23f --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/tiara_wing_9.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/headpiece_tiara_wing_9" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/icon/will_flame.json b/src/main/resources/assets/botania/models/icon/will_flame.json new file mode 100644 index 000000000..97f45a6cd --- /dev/null +++ b/src/main/resources/assets/botania/models/icon/will_flame.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/will_flame" + } +} \ No newline at end of file