diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 3d245da98..38e9d13e0 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -10,7 +10,6 @@ */ package vazkii.botania.client.core.handler; -import com.mojang.blaze3d.platform.GLX; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; @@ -86,7 +85,7 @@ public final class BossBarHandler { ShaderHelper.useShader(program, barUniformCallback); } - RenderHelper.drawTexturedModalRect(x, y, 0, u, v, w, h); + RenderHelper.drawTexturedModalRect(x, y, u, v, w, h); if(useShader) ShaderHelper.releaseShader(); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index e810444c1..a58b372fa 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -67,8 +67,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemMonocle; import vazkii.botania.common.lib.LibMisc; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; @Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class HUDHandler { @@ -258,7 +256,7 @@ public final class HUDHandler { RenderSystem.enableBlend(); RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - RenderHelper.drawTexturedModalRect(x, y, 0, 0, 251, width, 5); + RenderHelper.drawTexturedModalRect(x, y, 0, 251, width, 5); RenderSystem.disableBlend(); RenderSystem.color4f(1, 1, 1, 1); } @@ -280,7 +278,7 @@ public final class HUDHandler { RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.textureManager.bindTexture(manaBar); - RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); + RenderHelper.drawTexturedModalRect(x, y, u, v, 22, 15); RenderSystem.color4f(1F, 1F, 1F, 1F); mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, x - 20, y); @@ -391,20 +389,20 @@ public final class HUDHandler { RenderSystem.color4f(1F, 1F, 1F, alpha); mc.textureManager.bindTexture(manaBar); - RenderHelper.drawTexturedModalRect(x, y, 0, 0, 0, 102, 5); + RenderHelper.drawTexturedModalRect(x, y, 0, 0, 102, 5); int manaPercentage = Math.max(0, (int) ((double) mana / (double) maxMana * 100)); if(manaPercentage == 0 && mana > 0) manaPercentage = 1; - RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, 100, 3); + RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 5, 100, 3); float red = (color >> 16 & 0xFF) / 255F; float green = (color >> 8 & 0xFF) / 255F; float blue = (color & 0xFF) / 255F; RenderSystem.color4f(red, green, blue, alpha); - RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 0, 5, Math.min(100, manaPercentage), 3); + RenderHelper.drawTexturedModalRect(x + 1, y + 1, 0, 5, Math.min(100, manaPercentage), 3); RenderSystem.color4f(1, 1, 1, 1); } } diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index f564ab41d..8423af9cf 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -16,6 +16,7 @@ import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.ItemRenderer; @@ -164,18 +165,8 @@ public final class RenderHelper { ENTITY_TRANSLUCENT_GOLD = new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.GOLD, null, RenderType.of(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 128, true, true, glState)); } - public static void drawTexturedModalRect(int x, int y, float z, int u, int v, int width, int height) { - drawTexturedModalRect(x, y, z, u, v, width, height, 0.00390625F, 0.00390625F); - } - - public static void drawTexturedModalRect(int x, int y, float z, int u, int v, int width, int height, float f, float f1) { - Tessellator tessellator = Tessellator.getInstance(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - tessellator.getBuffer().vertex(x, y + height, z).texture(u * f, (v + height) * f1).endVertex(); - tessellator.getBuffer().vertex(x + width, y + height, z).texture((u + width) * f, (v + height) * f1).endVertex(); - tessellator.getBuffer().vertex(x + width, y, z).texture((u + width) * f, v * f1).endVertex(); - tessellator.getBuffer().vertex(x, y, z).texture(u * f, v * f1).endVertex(); - tessellator.draw(); + public static void drawTexturedModalRect(int x, int y, int u, int v, int width, int height) { + AbstractGui.blit(x, y, u, v, width, height, 256, 256); } public static void renderStar(MatrixStack ms, IRenderTypeBuffer buffers, int color, float xScale, float yScale, float zScale, long seed) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 2a75dcbd6..c3864b776 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile; import com.google.common.base.Preconditions; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; @@ -23,7 +22,6 @@ import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.item.BlockItem; import net.minecraft.item.FishBucketItem; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; @@ -59,7 +57,6 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.awt.*; import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; @@ -375,7 +372,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, if(recipe.matches(itemHandler)) { RenderSystem.color4f(1F, 1F, 1F, 1F); mc.textureManager.bindTexture(HUDHandler.manaBar); - RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 0, 8, 22, 15); + RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, 8, 22, 15); ItemStack stack = recipe.getOutput(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index a50a2c821..e754d604c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -10,7 +10,6 @@ */ package vazkii.botania.common.block.tile; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; @@ -376,7 +375,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, mc.textureManager.bindTexture(HUDHandler.manaBar); RenderSystem.color4f(1F, 1F, 1F, 1F); - RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, 0, progress == 1F ? 0 : 22, 8, 22, 15); + RenderHelper.drawTexturedModalRect(xc + radius + 9, yc - 8, progress == 1F ? 0 : 22, 8, 22, 15); if(progress == 1F) { mc.getItemRenderer().renderItemIntoGUI(new ItemStack(ModBlocks.livingrock), xc + radius + 16, yc + 8); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 9608722d7..a4c3f9a59 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -11,7 +11,6 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; -import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -64,7 +63,6 @@ import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.awt.*; import java.util.ArrayList; import java.util.List; @@ -412,7 +410,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); mc.textureManager.bindTexture(HUDHandler.manaBar); - RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15); + RenderHelper.drawTexturedModalRect(x, y, u, v, 22, 15); RenderSystem.color4f(1F, 1F, 1F, 1F); ItemStack tablet = new ItemStack(ModItems.manaTablet); 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 0153f1400..722bcfe90 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 @@ -11,28 +11,20 @@ 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.systems.RenderSystem; 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.Matrix4f; -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; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.tags.FluidTags; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; @@ -51,13 +43,10 @@ import vazkii.botania.api.item.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; -import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; -import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.handler.ModSounds; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -472,7 +461,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { } RenderSystem.color4f(1F, 1F, 1F, trans); - RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 9, 9); + RenderHelper.drawTexturedModalRect(x, y, u, v, 9, 9); x += 8; }