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 ef9d02f7f..5edf034a2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -20,12 +20,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.settings.GameSettings.Options; import net.minecraft.entity.player.EnumPlayerModelParts; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; @@ -108,13 +108,13 @@ public final class ContributorFancinessHandler { GlStateManager.rotate(r, 0F, 0F, 1F); float s = 0.9F; GlStateManager.scale(s, s, s); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.rotate(-r, 0F, 0F, 1F); GlStateManager.translate(-t, -0F, 0F); GlStateManager.scale(-1F, 1F, 1F); GlStateManager.translate(t, -0F, 0F); GlStateManager.rotate(r, 0F, 0F, 1F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } @@ -134,7 +134,7 @@ public final class ContributorFancinessHandler { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(-1.2F, 0.2F, 0.125F); GlStateManager.rotate(20F, 1F, 0F, 0F); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } @@ -152,7 +152,7 @@ public final class ContributorFancinessHandler { GlStateManager.scale(0.4F, 0.4F, 0.4F); GlStateManager.translate(1.2F, 0.5F, 0F); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + //ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); GlStateManager.popMatrix(); } @@ -160,19 +160,24 @@ public final class ContributorFancinessHandler { GlStateManager.pushMatrix(); Helper.translateToHeadLevel(event.entityPlayer); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - GlStateManager.rotate(180F, 0F, 0F, 1F); - GlStateManager.rotate(90F, 0F, 1F, 0F); - GlStateManager.scale(0.5F, 0.5F, 0.5F); - GlStateManager.translate(-0.5F, 0.7F, 0F); - ShaderHelper.useShader(ShaderHelper.gold); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + Minecraft.getMinecraft().getRenderItem().renderItemModelForEntity(flower, event.entityPlayer, ItemCameraTransforms.TransformType.THIRD_PERSON); ShaderHelper.releaseShader(); GlStateManager.popMatrix(); + +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// GlStateManager.rotate(180F, 0F, 0F, 1F); +// GlStateManager.rotate(90F, 0F, 1F, 0F); +// GlStateManager.scale(0.5F, 0.5F, 0.5F); +// GlStateManager.translate(-0.5F, 0.7F, 0F); +// +// ShaderHelper.useShader(ShaderHelper.gold); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// ShaderHelper.releaseShader(); +// GlStateManager.popMatrix(); } public static class ThreadContributorListLoader extends Thread { diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index 88cb4e9ae..a77ea5552 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -10,15 +10,34 @@ */ package vazkii.botania.client.core.helper; +import com.google.common.base.Function; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.block.model.ModelBlock; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelBakery; +import net.minecraft.client.resources.model.ModelRotation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IFlexibleBakedModel; +import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.ITransformation; +import net.minecraftforge.client.model.ModelLoaderRegistry; +import net.minecraftforge.fml.relauncher.ReflectionHelper; import vazkii.botania.client.lib.LibResources; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nullable; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Locale; public final class IconHelper { @@ -62,15 +81,22 @@ public final class IconHelper { return forName(ir, item.getUnlocalizedName().replaceAll("item\\.", "") + s); } - private static String json - /** - * Takes an icon, generates a "flat 3D" model in the style of held items. - * Used for rendering icons in 3D that have no item form - * @param sprite The texture to bake - * @return A baked model representing the flat 3D form of the given texture - */ - public IFlexibleBakedModel bakeModelFromIcon(TextureAtlasSprite sprite) { + * Load and bake an arbitrary model + */ + public static IFlexibleBakedModel loadAndBakeArbitraryModel(ResourceLocation location) { + + try { + IModel unbaked = ModelLoaderRegistry.getModel(location); + return unbaked.bake(unbaked.getDefaultState(), DefaultVertexFormats.ITEM, new Function() { + @Override + public TextureAtlasSprite apply(ResourceLocation input) { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString()); + } + }); + } catch (IOException ex) { + return null; + } } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index a2e0ed39c..a24393a08 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -71,11 +71,6 @@ import vazkii.botania.client.render.entity.RenderPixie; import vazkii.botania.client.render.entity.RenderPoolMinecart; import vazkii.botania.client.render.entity.RenderSpark; import vazkii.botania.client.render.entity.RenderThornChakram; -import vazkii.botania.client.render.item.RenderBow; -import vazkii.botania.client.render.item.RenderFloatingFlowerItem; -import vazkii.botania.client.render.item.RenderLens; -import vazkii.botania.client.render.item.RenderLexicon; -import vazkii.botania.client.render.item.RenderTransparentItem; import vazkii.botania.client.render.tile.RenderTileAlfPortal; import vazkii.botania.client.render.tile.RenderTileAltar; import vazkii.botania.client.render.tile.RenderTileAvatar; @@ -266,19 +261,19 @@ public class ClientProxy extends CommonProxy { // IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender); // IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender); - RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); - RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); - RenderBow renderBow = new RenderBow(); - - MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); - if(ConfigHandler.lexicon3dModel) - MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); - MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem); - MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower); - MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow); - MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow); +// RenderTransparentItem renderTransparentItem = new RenderTransparentItem(); +// RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem(); +// RenderBow renderBow = new RenderBow(); +// +// MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens()); +// if(ConfigHandler.lexicon3dModel) +// MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon()); +// MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem); +// MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem); +// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower); +// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower); +// MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow); +// MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow); RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower(); ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar()); diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 45c6d56e4..af2a3251a 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -15,6 +15,7 @@ import java.util.Queue; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java index 830a7b8cf..0bf9034b8 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerBrewery.java @@ -4,6 +4,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java index 870dd6c7c..675933e27 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerElvenTrade.java @@ -5,7 +5,10 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -91,7 +94,7 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { GuiDraw.drawTexturedModalRect(30, 10, 17, 17, 100, 80); GlStateManager.disableBlend(); GuiDraw.changeTexture(TextureMap.locationBlocksTexture); - Minecraft.getMinecraft().getRenderItem().renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48); + renderIcon(35, 29, BlockAlfPortal.portalTex, 48, 48, 240); // todo 1.8 } private static boolean hasElvenKnowledge() { @@ -150,4 +153,15 @@ public class RecipeHandlerElvenTrade extends TemplateRecipeHandler { } } + public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { + Tessellator tessellator = Tessellator.getInstance(); + tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().setBrightness(brightness); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + par5, 0, par3Icon.getMinU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + par5, 0, par3Icon.getMaxU(), par3Icon.getMaxV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + par4, par2 + 0, 0, par3Icon.getMaxU(), par3Icon.getMinV()); + tessellator.getWorldRenderer().addVertexWithUV(par1 + 0, par2 + 0, 0, par3Icon.getMinU(), par3Icon.getMinV()); + tessellator.draw(); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java index 7a8c35c85..4fe4ecfd6 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerManaPool.java @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java index 0f174053e..75c5e2315 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPetalApothecary.java @@ -4,6 +4,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java index d1d89d75b..0f97d663c 100644 --- a/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java +++ b/src/main/java/vazkii/botania/client/integration/nei/RecipeHandlerPureDaisy.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; @@ -39,7 +40,7 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { inputs.add(new PositionedStack(OreDictionary.getOres((String) recipe.getInput()), 42, 23)); else inputs.add(new PositionedStack(new ItemStack((Block) recipe.getInput()), 42, 23)); - output = new PositionedStack(new ItemStack(recipe.getOutput()), 101, 23); + output = new PositionedStack(new ItemStack(recipe.getOutputState().getBlock()), 101, 23); // todo 1.8 getOutput -> getOutputState } @Override @@ -117,7 +118,7 @@ public class RecipeHandlerPureDaisy extends TemplateRecipeHandler { if(recipe == null) continue; - if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(recipe.getOutput()), result)) + if(NEIServerUtils.areStacksSameTypeCrafting(new ItemStack(recipe.getOutputState().getBlock()), result)) // todo 1.8 getOutput -> getOutputState arecipes.add(new CachedPureDaisyRecipe(recipe)); } } diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index b6237a71c..49a7d1b80 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -12,7 +12,7 @@ package vazkii.botania.client.lib; public final class LibResources { - public static final String PREFIX_MOD = "botania:"; + public static final String PREFIX_MOD = "botania:"; // todo 1.8 take out the colon? public static final String PREFIX_LANG = "/assets/botania/lang/"; public static final String PREFIX_SHADER = "/assets/botania/shader/"; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 3b90bf371..ff5a29736 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -11,31 +11,29 @@ package vazkii.botania.client.model; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; import vazkii.botania.client.lib.LibResources; public class ModelPylon implements IPylonModel { - private IModelCustom model; - + //private IModelCustom model; + // todo 1.8 restore public ModelPylon() { - model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); + //model = AdvancedModelLoader.loadModel(new ResourceLocation(LibResources.OBJ_MODEL_PYLON)); } @Override public void renderCrystal() { - model.renderPart("Crystal"); + //model.renderPart("Crystal"); } @Override public void renderRing() { - model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); + //model.renderAllExcept("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"); } @Override public void renderGems() { - for(int i = 1; i < 5; i++) - model.renderPart("Ring_Gem0" + i); + //for(int i = 1; i < 5; i++) + //model.renderPart("Ring_Gem0" + i); } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java index 211634c9e..8f19ec82b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -10,6 +10,7 @@ */ package vazkii.botania.client.render.entity; +import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; @@ -43,7 +44,7 @@ public class RenderPixie extends RenderLiving { }; public RenderPixie() { - super(new ModelPixie(), 0.25F); + super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F); setRenderPassModel(new ModelPixie()); shadowSize = 0.0F; } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 4e0551539..3d8c13c94 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -42,7 +42,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0F, 0F, pos); - RenderLens.render(stack, lens.getLensColor(stack)); + // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); GlStateManager.popMatrix(); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index e24e4e8c1..f787800d1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -13,6 +13,7 @@ package vazkii.botania.client.render.tile; import java.awt.Color; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; @@ -42,20 +43,21 @@ public class RenderTileSparkChanger extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 0F, 1F, 0F); int renderPass = 0; - do { - IIcon icon = stack.getItem().getIcon(stack, renderPass); - if(icon != null) { - Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); - GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); - float f = icon.getMinU(); - float f1 = icon.getMaxU(); - float f2 = icon.getMinV(); - float f3 = icon.getMaxV(); - ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); - GlStateManager.color(1F, 1F, 1F); - } - renderPass++; - } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); + Minecraft.getMinecraft().getRenderItem().renderItemModel(stack); // todo 1.8 +// do { +// IIcon icon = stack.getItem().getIcon(stack, renderPass); +// if(icon != null) { +// Color color = new Color(stack.getItem().getColorFromItemStack(stack, renderPass)); +// GlStateManager.color((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue()); +// float f = icon.getMinU(); +// float f1 = icon.getMaxU(); +// float f2 = icon.getMinV(); +// float f3 = icon.getMaxV(); +// ItemRenderer.renderItemIn2D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); +// GlStateManager.color(1F, 1F, 1F); +// } +// renderPass++; +// } while(renderPass < stack.getItem().getRenderPasses(stack.getItemDamage())); GlStateManager.popMatrix(); } GlStateManager.color(1F, 1F, 1F, 1F); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 42d984661..6eba216f2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -90,7 +90,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { GlStateManager.pushMatrix(); GlStateManager.translate(-0.4F, -1.4F, -0.4375F); GlStateManager.scale(0.8F, 0.8F, 0.8F); - RenderLens.render(stack, lens.getLensColor(stack)); + // todo 1.8 RenderLens.render(stack, lens.getLensColor(stack)); GlStateManager.popMatrix(); } @@ -99,26 +99,26 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer { Block block = Blocks.carpet; int color = spreader.paddingColor; - RenderBlocks render = RenderBlocks.getInstance(); + //RenderBlocks render = RenderBlocks.getInstance(); float f = 1F / 16F; GlStateManager.translate(0F, -f, 0F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.translate(0F, -f * 15, 0F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.rotate(90F, 0F, 1F, 0F); GlStateManager.pushMatrix(); GlStateManager.scale(f * 14F, 1F, 1F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.popMatrix(); GlStateManager.rotate(90F, 1F, 0F, 0F); GlStateManager.translate(0F, 0F, -f / 2); GlStateManager.scale(f * 14F, 1F, f * 15F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); GlStateManager.translate(0F, f * 15F, 0F); - render.renderBlockAsItem(block, color, 1F); + //render.renderBlockAsItem(block, color, 1F); todo 1.8 } GlStateManager.enableRescaleNormal(); 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 436d76f04..31e9bc314 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -199,7 +199,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.translate(0.5F, 0.5F, 0F); GlStateManager.scale(0.3F, 0.3F, 0.3F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.iron_ore, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.iron_ore.getDefaultState(), 1F); } else if(name.equals("profmobius")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -255,7 +255,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { } else if(name.equals("nebris")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.rotate(180F, 1F, 0F, 0F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.glowstone, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.glowstone.getDefaultState(), 1F); } else if(name.equals("ible")) { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.2F, 1.2F, 1.2F); @@ -263,7 +263,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.portal, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.portal.getDefaultState(), 1F); } else if(name.equals("razz") || name.equals("razzleberryfox")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -281,7 +281,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1.2F, 1.2F, 1.2F); GlStateManager.translate(0F, 0.9F, 0F); GlStateManager.rotate(180F, 1F, 0F, 0F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.command_block, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.command_block.getDefaultState(), 1F); } else if(name.equals("bdoubleo100") || name.equals("bdoubleo")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -299,7 +299,7 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture); GlStateManager.scale(1.5F, 1.5F, 1.5F); GlStateManager.translate(1.5F, -0.5F, 0.7F); - RenderBlocks.getInstance().renderBlockAsItem(Blocks.cake, 0, 1F); + mc.getBlockRendererDispatcher().renderBlockBrightness(Blocks.cake.getDefaultState()); } else if(name.equals("sjin")) { GlStateManager.scale(1.25F, 1.25F, 1.25F); GlStateManager.rotate(180F, 0F, 0F, 1F); @@ -334,11 +334,11 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer { GlStateManager.scale(1F, -1F, -1F); MovingObjectPosition pos = mc.objectMouseOver; - if(!name.isEmpty() && pos != null && pos.blockX == potato.xCoord && pos.blockY == potato.yCoord && pos.blockZ == potato.zCoord) { + if(!name.isEmpty() && pos != null && pos.getBlockPos().equals(potato.getPos())) { GlStateManager.pushMatrix(); GlStateManager.translate(0F, -0.6F, 0F); - GlStateManager.rotate(-RenderManager.instance.playerViewY, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(RenderManager.instance.playerViewX, 1.0F, 0.0F, 0.0F); + GlStateManager.rotate(-mc.getRenderManager().playerViewY, 0.0F, 1.0F, 0.0F); + GlStateManager.rotate(mc.getRenderManager().playerViewX, 1.0F, 0.0F, 0.0F); float f = 1.6F; float f1 = 0.016666668F * f; GlStateManager.scale(-f1, -f1, f1); diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index affef4d54..c6faaf319 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -13,8 +13,8 @@ package vazkii.botania.common.core.handler; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; @@ -27,7 +27,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; -import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import vazkii.botania.api.boss.IBotaniaBoss; @@ -98,16 +97,17 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public TextureAtlasSprite getSubTileIconForName(String name) { - IIcon icon = (ConfigHandler.altFlowerTextures ? BlockSpecialFlower.iconsAlt : BlockSpecialFlower.icons).get(name); - return icon == null ? Blocks.red_flower.getIcon(0, 0) : icon; +// IIcon icon = (ConfigHandler.altFlowerTextures ? BlockSpecialFlower.iconsAlt : BlockSpecialFlower.icons).get(name); +// return icon == null ? Blocks.red_flower.getIcon(0, 0) : icon; todo 1.8 + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite("minecraft:red_flower"); } @Override public void registerBasicSignatureIcons(String name, TextureMap map) { - IIcon normal = IconHelper.forName(register, name); - IIcon alt = IconHelper.forName(register, BlockModFlower.ALT_DIR + "/" + name); - BlockSpecialFlower.icons.put(name, normal); - BlockSpecialFlower.iconsAlt.put(name, alt == null ? normal : alt); +// IIcon normal = IconHelper.forName(register, name); todo 1.8 +// IIcon alt = IconHelper.forName(register, BlockModFlower.ALT_DIR + "/" + name); +// BlockSpecialFlower.icons.put(name, normal); +// BlockSpecialFlower.iconsAlt.put(name, alt == null ? normal : alt); } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index f23181ff7..cb75ee1d7 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -12,8 +12,10 @@ package vazkii.botania.common.item.material; import java.awt.Color; import java.util.List; +import java.util.Locale; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -25,8 +27,11 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.TextureStitchEvent; +import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; @@ -44,12 +49,13 @@ import vazkii.botania.common.lib.LibItemNames; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import vazkii.botania.common.lib.LibMisc; public class ItemManaResource extends ItemMod implements IFlowerComponent, IElvenItem, IPickupAchievement { final int types = 23; - // begin dank_memes + // begin dank_memes todo 1.8 if I can figure out how to render arbitrary baked models then these will no longer be needed public TextureAtlasSprite tailIcon = null; public TextureAtlasSprite phiFlowerIcon = null; public TextureAtlasSprite goldfishIcon = null; @@ -72,6 +78,15 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve nerfBatIcon = IconHelper.forName(evt.map, "nerfBat"); } + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void onModelBake(ModelBakeEvent evt) { + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/tail", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/tail"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/phiFlower", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/phiFlower"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/goldfish", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/goldfish"))); + evt.modelRegistry.putObject(new ModelResourceLocation("botania:item/nerfBat", "inventory"), IconHelper.loadAndBakeArbitraryModel(new ResourceLocation("botania:item/nerfBat"))); + } + @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent event) { boolean rightEvent = event.action == Action.RIGHT_CLICK_AIR; diff --git a/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json b/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json new file mode 100644 index 000000000..d837ff588 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/goldfish.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/goldfish" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json b/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json new file mode 100644 index 000000000..4d029c6cf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/nerfBat.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/nerfBat" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json b/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json new file mode 100644 index 000000000..569ced203 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/phiFlower.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/phiFlower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dank_memes/tail.json b/src/main/resources/assets/botania/models/item/dank_memes/tail.json new file mode 100644 index 000000000..2e50e9e57 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dank_memes/tail.json @@ -0,0 +1,6 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "botania:items/tail" + } +} \ No newline at end of file