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 2e4e88a02..aff820578 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -41,8 +41,8 @@ public class RenderBabylonWeapon extends Render { @Override public void doRender(@Nonnull EntityBabylonWeapon weapon, double par2, double par4, double par6, float par8, float par9) { GlStateManager.pushMatrix(); - GlStateManager.translate((float)par2, (float)par4, (float)par6); - GlStateManager.rotate(weapon.getRotation(), 0F, 1F, 0F); + GlStateManager.translated(par2, par4, par6); + GlStateManager.rotatef(weapon.getRotation(), 0F, 1F, 0F); int live = weapon.getLiveTicks(); int delay = weapon.getDelay(); @@ -55,11 +55,11 @@ public class RenderBabylonWeapon extends Render { Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.pushMatrix(); float s = 1.5F; - GlStateManager.scale(s, s, s); - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.rotate(45F, 0F, 0F, 1F); + GlStateManager.scalef(s, s, s); + GlStateManager.rotatef(-90F, 0F, 1F, 0F); + GlStateManager.rotatef(45F, 0F, 0F, 1F); TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.kingKeyWeaponIcons[weapon.getVariety()]; - GlStateManager.color(1F, 1F, 1F, chargeMul); + GlStateManager.color4f(1F, 1F, 1F, chargeMul); float f = icon.getMinU(); float f1 = icon.getMaxU(); float f2 = icon.getMinV(); @@ -67,28 +67,28 @@ public class RenderBabylonWeapon extends Render { OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, 240, 240); GlStateManager.disableLighting(); - IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getIconWidth(), icon.getIconHeight(), 1F / 16F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, icon.getWidth(), icon.getHeight(), 1F / 16F); GlStateManager.popMatrix(); GlStateManager.disableCull(); GlStateManager.shadeModel(GL11.GL_SMOOTH); - GlStateManager.color(1F, 1F, 1F, chargeMul); + GlStateManager.color4f(1F, 1F, 1F, chargeMul); Minecraft.getInstance().textureManager.bindTexture(babylon); Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); Random rand = new Random(weapon.getUniqueID().getMostSignificantBits()); - GlStateManager.rotate(-90F, 1F, 0F, 0F); - GlStateManager.translate(0F, -0.3F + rand.nextFloat() * 0.1F, 1F); + GlStateManager.rotatef(-90F, 1F, 0F, 0F); + GlStateManager.translatef(0F, -0.3F + rand.nextFloat() * 0.1F, 1F); s = chargeMul; if(live > delay) s -= Math.min(1F, (live - delay + par9) * 0.2F); s *= 2F; - GlStateManager.scale(s, s, s); + GlStateManager.scalef(s, s, s); - GlStateManager.rotate(charge * 9F + (weapon.ticksExisted + par9) * 0.5F + rand.nextFloat() * 360F, 0F, 1F, 0F); + GlStateManager.rotatef(charge * 9F + (weapon.ticksExisted + par9) * 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(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 076c3c76a..c8f114159 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -35,11 +35,11 @@ public class RenderCorporeaSpark extends RenderSparkBase { @Override public void colorSpinningIcon(EntityCorporeaSpark entity, float a) { - int hex = entity.getNetwork().getColorValue(); + int hex = entity.getNetwork().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; - GlStateManager.color(r / 255F, g / 255F, b / 255F, a); + GlStateManager.color4f(r / 255F, g / 255F, b / 255F, a); } @Override @@ -60,13 +60,13 @@ public class RenderCorporeaSpark extends RenderSparkBase { return; GlStateManager.pushMatrix(); - GlStateManager.rotate(90F, 1F, 0F, 0F); + GlStateManager.rotatef(90F, 1F, 0F, 0F); float scalef = 1F / 6F; - GlStateManager.scale(scalef, scalef, scalef); + GlStateManager.scalef(scalef, scalef, scalef); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GlStateManager.color(1F, 1F, 1F, absTime / 10); - GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); + GlStateManager.color4f(1F, 1F, 1F, absTime / 10); + GlStateManager.translatef(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); Minecraft.getInstance().textureManager.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); TextureAtlasSprite icon = Minecraft.getInstance().getItemRenderer().getItemModelWithOverrides(stack, entity.world, null).getParticleTexture(); @@ -84,15 +84,15 @@ public class RenderCorporeaSpark extends RenderSparkBase { int shift = pieces / 2; float scale = 1F / pieces * 3F; - GlStateManager.scale(scale, scale, 1F); + GlStateManager.scalef(scale, scale, 1F); for(int i = -shift; i < shift; i++) { - GlStateManager.translate(gap * i, 0F, 0F); + GlStateManager.translatef(gap * i, 0F, 0F); for(int j = -shift; j < shift; j++) { - GlStateManager.translate(0F, gap * j, 0F); - IconHelper.renderIconIn3D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getIconWidth() / pieces, icon.getIconHeight() / pieces, 1F / 8F); - GlStateManager.translate(0F, -gap * j, 0F); + GlStateManager.translatef(0F, gap * j, 0F); + IconHelper.renderIconIn3D(Tessellator.getInstance(), minU + stepU * (i + shift), minV + stepV * (j + shift + 1), minU + stepU * (i + shift + 1), minV + stepV * (j + shift), icon.getWidth() / pieces, icon.getHeight() / pieces, 1F / 8F); + GlStateManager.translatef(0F, -gap * j, 0F); } - GlStateManager.translate(-gap * i, 0F, 0F); + GlStateManager.translatef(-gap * i, 0F, 0F); } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index 93befb9a3..06320c390 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -12,9 +12,9 @@ package vazkii.botania.client.render.entity; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.entity.model.ModelPlayer; import net.minecraft.client.resources.DefaultPlayerSkin; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.ARBShaderObjects; @@ -26,11 +26,11 @@ import javax.annotation.Nonnull; public class RenderDoppleganger extends RenderBiped { - public static final float DEFAULT_GRAIN_INTENSITY = 0.05F; - public static final float DEFAULT_DISFIGURATION = 0.025F; + private static final float DEFAULT_GRAIN_INTENSITY = 0.05F; + private static final float DEFAULT_DISFIGURATION = 0.025F; - public static float grainIntensity = DEFAULT_GRAIN_INTENSITY; - public static float disfiguration = DEFAULT_DISFIGURATION; + private static float grainIntensity = DEFAULT_GRAIN_INTENSITY; + private static float disfiguration = DEFAULT_DISFIGURATION; public static final ShaderCallback callback = shader -> { // Frag Uniforms @@ -78,7 +78,7 @@ public class RenderDoppleganger extends RenderBiped { Minecraft mc = Minecraft.getInstance(); if(!(mc.getRenderViewEntity() instanceof AbstractClientPlayer)) - return DefaultPlayerSkin.getDefaultSkinLegacy(); + return DefaultPlayerSkin.getDefaultSkin(entity.getUniqueID()); return ((AbstractClientPlayer) mc.getRenderViewEntity()).getLocationSkin(); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java index ec8527fa3..8f94eecd4 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -29,7 +29,7 @@ public class RenderManaStorm extends Render { @Override public void doRender(@Nonnull EntityManaStorm storm, double x, double y, double z, float something, float pticks) { GlStateManager.pushMatrix(); - GlStateManager.translate(x, y, z); + GlStateManager.translated(x, y, z); float maxScale = 1.95F; float scale = 0.05F + ((float) storm.burstsFired / EntityManaStorm.TOTAL_BURSTS - (storm.deathTime == 0 ? 0 : storm.deathTime + pticks) / EntityManaStorm.DEATH_TIME) * maxScale; RenderHelper.renderStar(0x00FF00, scale, scale, scale, storm.getUniqueID().getMostSignificantBits()); 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 fcd12d0fd..6cfb50309 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPixie.java @@ -27,7 +27,7 @@ import javax.annotation.Nonnull; public class RenderPixie extends RenderLiving { - final ShaderCallback callback = shader -> { + private final ShaderCallback callback = shader -> { // Frag Uniforms int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration"); ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F); @@ -51,10 +51,10 @@ public class RenderPixie extends RenderLiving { @Override public void doRender(@Nonnull EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { - if(pixie.getType() == 1) + if(pixie.getPixieType() == 1) ShaderHelper.useShader(ShaderHelper.doppleganger, callback); super.doRender(pixie, par2, par4, par6, par8, par9); - if(pixie.getType() == 1) + if(pixie.getPixieType() == 1) ShaderHelper.releaseShader(); } @@ -65,7 +65,7 @@ public class RenderPixie extends RenderLiving { bindTexture(getEntityTexture(par1EntityPixie)); float f1 = 1.0F; GlStateManager.enableBlend(); - GlStateManager.disableAlpha(); + GlStateManager.disableAlphaTest(); GlStateManager.blendFunc(GL11.GL_ONE, GL11.GL_ONE); if (par1EntityPixie.isInvisible()) @@ -77,8 +77,8 @@ public class RenderPixie extends RenderLiving { int j = c0 % 65536; int k = c0 / 65536; OpenGlHelper.glMultiTexCoord2f(OpenGlHelper.GL_TEXTURE1, j / 1.0F, k / 1.0F); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - GlStateManager.color(1.0F, 1.0F, 1.0F, f1); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, f1); return 1; } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index 1a12e291e..72f5f50b3 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -32,7 +32,7 @@ public class RenderPoolMinecart extends RenderMinecart { protected void renderCartContents(EntityPoolMinecart poolCart, float partialTicks, @Nonnull IBlockState state) { RenderTilePool.forceVariant = BlockPool.Variant.DEFAULT; RenderTilePool.forceManaNumber = poolCart.getMana(); - TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1, 0); + TileEntityRendererDispatcher.instance.getRenderer(TilePool.class).render(null, poolCart.posX, poolCart.posY, poolCart.posZ, ClientTickHandler.partialTicks, -1); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java index ffde0e04a..a40ce1704 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java @@ -8,9 +8,9 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.client.renderer.RenderItem; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.entity.RenderSprite; import net.minecraft.entity.Entity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -19,11 +19,11 @@ import javax.annotation.Nonnull; import java.util.function.Function; // Same as RenderSnowball, but ItemStack sensitive -public class RenderSnowballStack extends RenderSnowball { +public class RenderSnowballStack extends RenderSprite { private final Function stackGetter; - public RenderSnowballStack(RenderManager renderManagerIn, Item item, RenderItem render, Function stackGetter) { + public RenderSnowballStack(RenderManager renderManagerIn, Item item, ItemRenderer render, Function stackGetter) { super(renderManagerIn, item, render); this.stackGetter = stackGetter; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 6448eef31..711f9d4b0 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -37,7 +37,7 @@ public abstract class RenderSparkBase extends Render { TextureAtlasSprite iicon = getBaseIcon(tEntity); GlStateManager.pushMatrix(); - GlStateManager.translate((float)par2, (float)par4, (float)par6); + GlStateManager.translated(par2, par4, par6); GlStateManager.enableRescaleNormal(); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -48,28 +48,28 @@ public abstract class RenderSparkBase extends Render { float a = 0.1F + (tEntity.isInvisible() ? 0 : 1) * 0.8F; - GlStateManager.color(1F, 1F, 1F, (0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2) * a); + GlStateManager.color4f(1F, 1F, 1F, (0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2) * a); float scale = 0.75F + 0.1F * (float) Math.sin(time / 10); - GlStateManager.scale(scale, scale, scale); + GlStateManager.scalef(scale, scale, scale); bindEntityTexture(tEntity); Tessellator tessellator = Tessellator.getInstance(); GlStateManager.pushMatrix(); float r = 180.0F - renderManager.playerViewY; - GlStateManager.rotate(r, 0.0F, 1.0F, 0.0F); - GlStateManager.rotate(-renderManager.playerViewX, 1F, 0F, 0F); + GlStateManager.rotatef(r, 0.0F, 1.0F, 0.0F); + GlStateManager.rotatef(-renderManager.playerViewX, 1F, 0F, 0F); renderIcon(tessellator, iicon); TextureAtlasSprite spinningIcon = getSpinningIcon(tEntity); if(spinningIcon != null) { - GlStateManager.translate(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); - GlStateManager.scale(0.2F, 0.2F, 0.2F); + GlStateManager.translatef(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); + GlStateManager.scalef(0.2F, 0.2F, 0.2F); colorSpinningIcon(tEntity, a); renderIcon(tessellator, spinningIcon); } GlStateManager.popMatrix(); - GlStateManager.color(1F, 1F, 1F, 1F); + GlStateManager.color4f(1F, 1F, 1F, 1F); renderCallback(tEntity, par9); GlStateManager.disableBlend(); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java index be235f9c1..4e7d2c6f8 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockRenderEvents.java @@ -12,23 +12,24 @@ package vazkii.botania.client.render.world; import net.minecraft.client.Minecraft; import net.minecraft.world.World; +import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.client.event.RenderWorldLastEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.api.distmarker.Dist; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.world.WorldTypeSkyblock; -@Mod.EventBusSubscriber(value = Side.CLIENT, modid = LibMisc.MOD_ID) +@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID) public final class SkyblockRenderEvents { @SubscribeEvent public static void onRender(RenderWorldLastEvent event) { World world = Minecraft.getInstance().world; - if(ConfigHandler.enableFancySkybox && world.provider.getDimension() == 0 && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getInstance().world))) { - if(!(world.provider.getSkyRenderer() instanceof SkyblockSkyRenderer)) - world.provider.setSkyRenderer(new SkyblockSkyRenderer()); + if(ConfigHandler.enableFancySkybox && world.getDimension().getType() == DimensionType.OVERWORLD && (ConfigHandler.enableFancySkyboxInNormalWorlds || WorldTypeSkyblock.isWorldSkyblock(Minecraft.getInstance().world))) { + if(!(world.getDimension().getSkyRenderer() instanceof SkyblockSkyRenderer)) + world.getDimension().setSkyRenderer(new SkyblockSkyRenderer()); } } diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index b30cdeb4f..8eef6feb8 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -28,7 +28,7 @@ import vazkii.botania.client.lib.LibResources; import java.util.Random; -public class SkyblockSkyRenderer extends IRenderHandler { +public class SkyblockSkyRenderer implements IRenderHandler { private static final ResourceLocation textureSkybox = new ResourceLocation(LibResources.MISC_SKYBOX); private static final ResourceLocation textureRainbow = new ResourceLocation(LibResources.MISC_RAINBOW);