diff --git a/MC18_notes.txt b/MC18_notes.txt index 7e5434e25..fd1c58afa 100644 --- a/MC18_notes.txt +++ b/MC18_notes.txt @@ -8,6 +8,7 @@ This can be changed to match vanilla signature, but either would break backward Anyways, vanilla removed it from their method so we follow suit. * SubTileEntity's methods that are copied from block (onBlockadded, etc.) updated to match vanilla counterparts * Multiblock system reworked to use states and blockposes +* Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard. -- Other -- * Most things left untouched to make patches from upstream easier diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index f4820f02c..a8af5a43e 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -332,7 +332,11 @@ public final class BotaniaAPI { String key = getMagnetKey(stack); return magnetBlacklist.contains(key); } - + + public static boolean isBlockBlacklistedFromMagnet(IBlockState state) { + return isBlockBlacklistedFromMagnet(state.getBlock(), state.getBlock().getMetaFromState(state), 0); + } + public static boolean isBlockBlacklistedFromMagnet(Block block, int meta) { return isBlockBlacklistedFromMagnet(block, meta, 0); } 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 1d437bec3..270285700 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -61,7 +61,7 @@ import vazkii.botania.client.fx.FXWisp; import vazkii.botania.client.gui.lexicon.GuiLexicon; import vazkii.botania.client.gui.lexicon.GuiLexiconEntry; import vazkii.botania.client.gui.lexicon.GuiLexiconIndex; -import vazkii.botania.client.integration.nei.NEIGuiHooks; +// todo 1.8.8 restore when nei updates import vazkii.botania.client.integration.nei.NEIGuiHooks; import vazkii.botania.client.render.entity.RenderBabylonWeapon; import vazkii.botania.client.render.entity.RenderCorporeaSpark; import vazkii.botania.client.render.entity.RenderDoppleganger; @@ -307,19 +307,19 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon()); ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay()); ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows()); - ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); + // todo 1.8.8 awaiting forge issue ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride()); ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu()); ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride()); RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie()); - RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark()); RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager())); - RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark()); - RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); + RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager())); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem())); RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither(Minecraft.getMinecraft().getRenderManager())); RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm(Minecraft.getMinecraft().getRenderManager())); @@ -331,7 +331,7 @@ public class ClientProxy extends CommonProxy { @Override @Optional.Method(modid = "NotEnoughItems") public void registerNEIStuff() { - NEIGuiHooks.init(); + // todo 1.8.8 restore when nei updates NEIGuiHooks.init(); } @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index af2a3251a..aa2448722 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -18,6 +18,7 @@ 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.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; @@ -71,13 +72,13 @@ public class FXSparkle extends EntityFX { GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F); Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXSparkle sparkle : queuedRenders) sparkle.renderQueued(tessellator); tessellator.draw(); ShaderHelper.useShader(ShaderHelper.filmGrain); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXSparkle sparkle : queuedCorruptRenders) sparkle.renderQueued(tessellator); tessellator.draw(); @@ -105,13 +106,10 @@ public class FXSparkle extends EntityFX { float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); float var16 = 1.0F; - tessellator.getWorldRenderer().setBrightness(0x0000f0); - - tessellator.getWorldRenderer().setColorRGBA_F(particleRed * var16, particleGreen * var16, particleBlue * var16, 1); - tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12, var9, var11); - tessellator.getWorldRenderer().addVertexWithUV(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12, var9, var10); - tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12, var8, var10); - tessellator.getWorldRenderer().addVertexWithUV(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12, var8, var11); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).lightmap(0x00, 0xF0).endVertex(); } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 6de0de3bc..c30082fd2 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -18,6 +18,7 @@ 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.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.ResourceLocation; @@ -84,7 +85,7 @@ public class FXWisp extends EntityFX { Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles); if(!queuedRenders.isEmpty()) { - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedRenders) wisp.renderQueued(tessellator, true); tessellator.draw(); @@ -92,7 +93,7 @@ public class FXWisp extends EntityFX { if(!queuedDepthIgnoringRenders.isEmpty()) { GlStateManager.disableDepth(); - tessellator.getWorldRenderer().startDrawingQuads(); + tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR); for(FXWisp wisp : queuedDepthIgnoringRenders) wisp.renderQueued(tessellator, false); tessellator.draw(); @@ -120,12 +121,10 @@ public class FXWisp extends EntityFX { float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY); float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ); - tessellator.getWorldRenderer().setBrightness(240); - tessellator.getWorldRenderer().setColorRGBA_F(particleRed, particleGreen, particleBlue, 0.5F); - tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10, 0, 1); - tessellator.getWorldRenderer().addVertexWithUV(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10, 1, 1); - tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10, 1, 0); - tessellator.getWorldRenderer().addVertexWithUV(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10, 0, 0); + tessellator.getWorldRenderer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); + tessellator.getWorldRenderer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).lightmap(0x00, 0xF0).endVertex(); } @Override 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 870dbdf6a..6bccb9ae3 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -32,7 +32,7 @@ import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.entity.EntityBabylonWeapon; import vazkii.botania.common.item.relic.ItemKingKey; -public class RenderBabylonWeapon extends Render { +public class RenderBabylonWeapon extends Render { private static final ResourceLocation babylon = new ResourceLocation(LibResources.MISC_BABYLON); @@ -41,8 +41,7 @@ public class RenderBabylonWeapon extends Render { } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - EntityBabylonWeapon weapon = (EntityBabylonWeapon) par1Entity; + public void doRender(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); @@ -109,7 +108,7 @@ public class RenderBabylonWeapon extends Render { } @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityBabylonWeapon p_110775_1_) { return null; } 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 b27ed254b..d1755ba5f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -23,8 +23,6 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; @@ -46,8 +44,10 @@ public class RenderCorporeaSpark extends RenderSparkBase { public void colorSpinningIcon(EntityCorporeaSpark entity, float a) { int network = Math.min(15, entity.getNetwork()); int hex = EnumDyeColor.byMetadata(network).getMapColor().colorValue; - - GlStateManager.color(EntitySheep.fleeceColorTable[network][0], EntitySheep.fleeceColorTable[network][1], EntitySheep.fleeceColorTable[network][2], a); + int r = (hex & 0xFF0000) >> 16; + int g = (hex & 0xFF00) >> 8; + int b = (hex & 0xFF); + GlStateManager.color(r, g, b, a); } @Override 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 ab2fe9088..c0d1dc218 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -24,7 +24,7 @@ import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.common.entity.EntityDoppleganger; -public class RenderDoppleganger extends RenderBiped { +public class RenderDoppleganger extends RenderBiped { public static float DEFAULT_GRAIN_INTENSITY = 0.05F; public static float DEFAULT_DISFIGURATION = 0.025F; @@ -65,8 +65,7 @@ public class RenderDoppleganger extends RenderBiped { } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - EntityDoppleganger dopple = (EntityDoppleganger) par1Entity; + public void doRender(EntityDoppleganger dopple, double par2, double par4, double par6, float par8, float par9) { BossBarHandler.setCurrentBoss(dopple); int invulTime = dopple.getInvulTime(); @@ -79,12 +78,12 @@ public class RenderDoppleganger extends RenderBiped { } ShaderHelper.useShader(ShaderHelper.doppleganger, callback); - super.doRender(par1Entity, par2, par4, par6, par8, par9); + super.doRender(dopple, par2, par4, par6, par8, par9); ShaderHelper.releaseShader(); } @Override - protected ResourceLocation getEntityTexture(Entity par1Entity) { + protected ResourceLocation getEntityTexture(EntityDoppleganger par1Entity) { return Minecraft.getMinecraft().thePlayer.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 d7aaaf7c6..460c0ae3f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java @@ -22,27 +22,26 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityManaStorm; -public class RenderManaStorm extends Render { +public class RenderManaStorm extends Render { public RenderManaStorm(RenderManager renderManager) { super(renderManager); } @Override - public void doRender(Entity e, double x, double y, double z, float something, float pticks) { + public void doRender(EntityManaStorm storm, double x, double y, double z, float something, float pticks) { GlStateManager.pushMatrix(); GlStateManager.translate(x, y, z); - EntityManaStorm storm = (EntityManaStorm) e; 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, e.getUniqueID().getMostSignificantBits()); + RenderHelper.renderStar(0x00FF00, scale, scale, scale, storm.getUniqueID().getMostSignificantBits()); GlStateManager.disableBlend(); GlStateManager.disableRescaleNormal(); GlStateManager.popMatrix(); } @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityManaStorm p_110775_1_) { return null; } 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 8f19ec82b..14c6de07e 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 vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPixie; import vazkii.botania.common.entity.EntityPixie; -public class RenderPixie extends RenderLiving { +public class RenderPixie extends RenderLiving { ShaderCallback callback = new ShaderCallback() { @@ -50,17 +50,15 @@ public class RenderPixie extends RenderLiving { } @Override - protected ResourceLocation getEntityTexture(Entity entity) { + protected ResourceLocation getEntityTexture(EntityPixie entity) { return new ResourceLocation(LibResources.MODEL_PIXIE); } @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { - EntityPixie pixie = (EntityPixie) par1Entity; - + public void doRender(EntityPixie pixie, double par2, double par4, double par6, float par8, float par9) { if(pixie.getType() == 1) ShaderHelper.useShader(ShaderHelper.doppleganger, callback); - super.doRender(par1Entity, par2, par4, par6, par8, par9); + super.doRender(pixie, par2, par4, par6, par8, par9); if(pixie.getType() == 1) ShaderHelper.releaseShader(); } 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 ec9720f05..7b9d2df98 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -18,17 +18,16 @@ import net.minecraft.entity.item.EntityMinecart; import vazkii.botania.client.render.tile.RenderTilePool; import vazkii.botania.common.entity.EntityPoolMinecart; -public class RenderPoolMinecart extends RenderMinecart { +public class RenderPoolMinecart extends RenderMinecart { public RenderPoolMinecart(RenderManager p_i46155_1_) { super(p_i46155_1_); } @Override - protected void func_180560_a(EntityMinecart p_147910_1_, float p_147910_2_, IBlockState state) { - EntityPoolMinecart poolCart = (EntityPoolMinecart) p_147910_1_; + protected void func_180560_a(EntityPoolMinecart poolCart, float p_147910_2_, IBlockState state) { RenderTilePool.forceManaNumber = poolCart.getMana(); - super.func_180560_a(p_147910_1_, p_147910_2_, state); + super.func_180560_a(poolCart, p_147910_2_, state); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java index a60c6512a..0033c0719 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java @@ -28,15 +28,14 @@ import vazkii.botania.common.entity.EntityThornChakram; import vazkii.botania.common.item.ModItems; // Basically a bit of an extension of RenderSnowball -public class RenderThornChakram extends Render { +public class RenderThornChakram extends Render { public RenderThornChakram(RenderManager renderManager) { super(renderManager); } @Override - public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { - EntityThornChakram c = (EntityThornChakram) p_76986_1_; + public void doRender(EntityThornChakram c, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { boolean fire = c.isFire(); IIcon iicon = ModItems.thornChakram.getIconFromDamage(fire ? 1 : 0); @@ -45,7 +44,7 @@ public class RenderThornChakram extends Render { GlStateManager.translate((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_); GlStateManager.enableRescaleNormal(); GlStateManager.scale(0.5F, 0.5F, 0.5F); - bindEntityTexture(p_76986_1_); + bindEntityTexture(c); Tessellator tessellator = Tessellator.getInstance(); func_77026_a(tessellator, iicon, fire ? 240 : -1); @@ -55,7 +54,7 @@ public class RenderThornChakram extends Render { } @Override - protected ResourceLocation getEntityTexture(Entity p_110775_1_) { + protected ResourceLocation getEntityTexture(EntityThornChakram p_110775_1_) { return TextureMap.locationBlocksTexture; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index d0cd563d0..0041f4b22 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -65,7 +65,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl setStepSound(soundTypeMetal); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java index ebd052470..f13369a65 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionAllure.java @@ -22,7 +22,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionAllure extends PotionMod { public PotionAllure() { - super(ConfigHandler.potionIDAllure, LibPotionNames.ALLURE, false, 0x0034E4, 5); + super(LibPotionNames.ALLURE, false, 0x0034E4, 5); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java index 41fde3240..950576e3a 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionBloodthirst.java @@ -28,7 +28,7 @@ public class PotionBloodthirst extends PotionMod { private static final int RANGE = 64; public PotionBloodthirst() { - super(ConfigHandler.potionIDBloodthirst, LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); + super(LibPotionNames.BLOODTHIRST, false, 0xC30000, 3); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java index 8fcdf9914..35c4bbfa6 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionClear.java @@ -20,7 +20,7 @@ import vazkii.botania.common.lib.LibPotionNames; public class PotionClear extends PotionMod { public PotionClear() { - super(ConfigHandler.potionIDClear, LibPotionNames.CLEAR, false, 0xFFFFFF, 0); + super(LibPotionNames.CLEAR, false, 0xFFFFFF, 0); } @Override diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java index b5d2f0747..310370dc5 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionEmptiness.java @@ -27,7 +27,7 @@ public class PotionEmptiness extends PotionMod { private static final int RANGE = 128; public PotionEmptiness() { - super(ConfigHandler.potionIDEmptiness, LibPotionNames.EMPTINESS, false, 0xFACFFF, 2); + super(LibPotionNames.EMPTINESS, false, 0xFACFFF, 2); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java index 68c92ba93..594b2ba84 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionFeatherfeet.java @@ -20,7 +20,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionFeatherfeet extends PotionMod { public PotionFeatherfeet() { - super(ConfigHandler.potionIDFeatherfeet, LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); + super(LibPotionNames.FEATHER_FEET, false, 0x26ADFF, 1); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java index 24d3ac6b6..c97056859 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionMod.java @@ -22,8 +22,8 @@ public class PotionMod extends Potion { private static final ResourceLocation resource = new ResourceLocation(LibResources.GUI_POTIONS); - public PotionMod(int id, String name, boolean badEffect, int color, int iconIndex) { - super(id, new ResourceLocation("botania", name), badEffect, color); + public PotionMod(String name, boolean badEffect, int color, int iconIndex) { + super(new ResourceLocation("botania", name), badEffect, color); setPotionName("botania.potion." + name); setIconIndex(iconIndex % 8, iconIndex / 8); } diff --git a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java index 339b07aa2..de36f5a22 100644 --- a/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java +++ b/src/main/java/vazkii/botania/common/brew/potion/PotionSoulCross.java @@ -21,7 +21,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; public class PotionSoulCross extends PotionMod { public PotionSoulCross() { - super(ConfigHandler.potionIDSoulCross, LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); + super(LibPotionNames.SOUL_CROSS, false, 0x47453d, 0); MinecraftForge.EVENT_BUS.register(this); } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java index 342eefd36..f53c737e7 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CommonProxy.java @@ -129,7 +129,7 @@ public class CommonProxy { if(Botania.gardenOfGlassLoaded) MinecraftForge.EVENT_BUS.register(new SkyblockWorldEvents()); - FMLCommonHandler.instance().bus().register(new CommonTickHandler()); + MinecraftForge.EVENT_BUS.register(new CommonTickHandler()); FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 98ffd619c..968a7f043 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -397,7 +397,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public void render(ItemStack stack, EntityPlayer player, float partialTicks) { Minecraft mc = Minecraft.getMinecraft(); Tessellator tess = Tessellator.getInstance(); - Tessellator.renderingWorldRenderer = false; + // todo 1.8.8 Tessellator.renderingWorldRenderer = false; GlStateManager.pushMatrix(); GlStateManager.enableBlend(); diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index bbfeef799..f168c0f5c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -27,6 +27,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AltGrassVariant; import vazkii.botania.client.core.helper.IconHelper; @@ -57,7 +58,7 @@ public class ItemGrassSeeds extends ItemMod { super(); setUnlocalizedName(LibItemNames.GRASS_SEEDS); setHasSubtypes(true); - FMLCommonHandler.instance().bus().register(this); + MinecraftForge.EVENT_BUS.register(this); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index b723a806f..ff0189ec5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -15,6 +15,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import vazkii.botania.common.block.subtile.functional.SubTileSpectranthemum; @@ -50,7 +51,7 @@ public class ItemOpenBucket extends ItemMod { par2World.setBlockToAir(pos); for(int x = 0; x < 5; x++) - par2World.spawnParticle("explode", pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); + par2World.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); return par1ItemStack; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index be9d9f1f1..2a19b2930 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -13,12 +13,11 @@ package vazkii.botania.common.item.equipment.armor.manaweave; import java.util.List; import net.minecraft.client.model.ModelBiped; -import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.core.helper.IconHelper; @@ -34,8 +33,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchievement { - - IIcon iconChristmas; public ItemManaweaveArmor(int type, String name) { super(type, name, BotaniaAPI.manaweaveArmorMaterial); @@ -48,21 +45,21 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return models[slot]; } - @Override + /*@Override public void registerIcons(IIconRegister par1IconRegister) { super.registerIcons(par1IconRegister); iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday"); - } + }*/ @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } - @Override - public IIcon getIconFromDamage(int dmg) { - return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); - } +// @Override +// public IIcon getIconFromDamage(int dmg) { +// return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); +// } todo 1.8.8 to smartmodel or getModel lookup @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index e378d5378..ebf46af02 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -16,13 +16,11 @@ 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.IIconRegister; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraftforge.client.event.RenderPlayerEvent; import net.minecraftforge.oredict.RecipeSorter; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 3bf997eea..bb9a10363 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -18,6 +18,7 @@ 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; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.IMob; @@ -61,9 +62,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); + List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.entity.posX - range, event.entity.posY - range, event.entity.posZ - range, event.entity.posX + range, event.entity.posY + range, event.entity.posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { - if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, mobs)) { + if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.entityLiving, ((List) mobs))) { if(event.entityLiving instanceof EntityCreeper) ReflectionHelper.setPrivateValue(EntityCreeper.class, (EntityCreeper) event.entityLiving, 2, LibObfuscation.TIME_SINCE_IGNITED); event.entityLiving.heal(event.entityLiving.getMaxHealth()); 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 def00a596..faad2732c 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 @@ -26,6 +26,7 @@ import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -89,7 +90,6 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub public ItemFlightTiara() { super(LibItemNames.FLIGHT_TIARA); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); setHasSubtypes(true); } @@ -475,11 +475,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub Tessellator tes = Tessellator.getInstance(); ShaderHelper.useShader(ShaderHelper.halo); - tes.getWorldRenderer().startDrawingQuads(); - tes.getWorldRenderer().addVertexWithUV(-0.75, 0, -0.75, 0, 0); - tes.getWorldRenderer().addVertexWithUV(-0.75, 0, 0.75, 0, 1); - tes.getWorldRenderer().addVertexWithUV(0.75, 0, 0.75, 1, 1); - tes.getWorldRenderer().addVertexWithUV(0.75, 0, -0.75, 1, 0); + tes.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + tes.getWorldRenderer().pos(-0.75, 0, -0.75).tex(0, 0).endVertex(); + tes.getWorldRenderer().pos(-0.75, 0, 0.75).tex(0, 1).endVertex(); + tes.getWorldRenderer().pos(0.75, 0, 0.75).tex(1, 1).endVertex(); + tes.getWorldRenderer().pos(0.75, 0, -0.75).tex(1, 0).endVertex(); tes.draw(); ShaderHelper.releaseShader(); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 50dc76d14..62a0c1e42 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -116,16 +116,11 @@ public class ItemMagnetRing extends ItemBauble { return false; BlockPos pos = new BlockPos(item); - Block block = item.worldObj.getBlockState(x, y, z); - int meta = item.worldObj.getBlockMetadata(x, y, z); - if(BotaniaAPI.isBlockBlacklistedFromMagnet(block, meta)) + if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.worldObj.getBlockState(pos))) return false; - block = item.worldObj.getBlock(x, y - 1, z); - meta = item.worldObj.getBlockMetadata(x, y - 1, z); - - if(BotaniaAPI.isBlockBlacklistedFromMagnet(block, meta)) + if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.worldObj.getBlockState(pos.down()))) return false; return true;