break from client for now

This commit is contained in:
Vincent Lee committed 2015-11-16 13:35:58 -06:00
1 parent 29e42d86ea
commit 9da9d61880
4 files changed
+22 -41

No files matched your search

@@ -59,7 +59,7 @@ public final class RenderHelper {
int var5 = 0;
int var6;
int var7;
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRendererObj;
for (var6 = 0; var6 < tooltipData.size(); ++var6) {
var7 = fontRenderer.getStringWidth(tooltipData.get(var6));
if (var7 > var5)
@@ -112,13 +112,13 @@ public final class RenderHelper {
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glShadeModel(GL11.GL_SMOOTH);
Tessellator var15 = Tessellator.getInstance();
var15.startDrawingQuads();
var15.setColorRGBA_F(var8, var9, var10, var7);
var15.addVertex(par3, par2, z);
var15.addVertex(par1, par2, z);
var15.setColorRGBA_F(var12, var13, var14, var11);
var15.addVertex(par1, par4, z);
var15.addVertex(par3, par4, z);
var15.getWorldRenderer().startDrawingQuads();
var15.getWorldRenderer().setColorRGBA_F(var8, var9, var10, var7);
var15.getWorldRenderer().addVertex(par3, par2, z);
var15.getWorldRenderer().addVertex(par1, par2, z);
var15.getWorldRenderer().setColorRGBA_F(var12, var13, var14, var11);
var15.getWorldRenderer().addVertex(par1, par4, z);
var15.getWorldRenderer().addVertex(par3, par4, z);
var15.draw();
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glDisable(GL11.GL_BLEND);
@@ -170,12 +170,12 @@ public final class RenderHelper {
GL11.glRotatef(random.nextFloat() * 360F, 1F, 0F, 0F);
GL11.glRotatef(random.nextFloat() * 360F, 0F, 1F, 0F);
GL11.glRotatef(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F);
tessellator.startDrawing(GL11.GL_TRIANGLE_FAN);
tessellator.getWorldRenderer().startDrawing(GL11.GL_TRIANGLE_FAN);
float f3 = random.nextFloat() * 20F + 5F + f2 * 10F;
float f4 = random.nextFloat() * 2F + 1F + f2 * 2F;
tessellator.setColorRGBA_I(color, (int) (255F * (1F - f2)));
tessellator.getWorldRenderer().setColorRGBA_I(color, (int) (255F * (1F - f2)));
tessellator.getWorldRenderer().addVertex(0, 0, 0);
tessellator.setColorRGBA_F(0F, 0F, 0F, 0);
tessellator.getWorldRenderer().setColorRGBA_F(0F, 0F, 0F, 0);
tessellator.getWorldRenderer().addVertex(-0.866D * f4, f3, -0.5F * f4);
tessellator.getWorldRenderer().addVertex(0.866D * f4, f3, -0.5F * f4);
tessellator.getWorldRenderer().addVertex(0, f3, 1F * f4);
@@ -195,7 +195,7 @@ public final class RenderHelper {
public static void renderProgressPie(int x, int y, float progress, ItemStack stack) {
Minecraft mc = Minecraft.getMinecraft();
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y);
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y);
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
GL11.glEnable(GL11.GL_STENCIL_TEST);
@@ -204,7 +204,7 @@ public final class RenderHelper {
GL11.glStencilFunc(GL11.GL_NEVER, 1, 0xFF);
GL11.glStencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP);
GL11.glStencilMask(0xFF);
RenderItem.getInstance().renderItemAndEffectIntoGUI(mc.fontRenderer, mc.renderEngine, stack, x, y);
mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x, y);
mc.renderEngine.bindTexture(new ResourceLocation(LibResources.GUI_MANA_HUD));
int r = 10;
@@ -61,26 +61,6 @@ 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;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.client.render.block.RenderAltar;
import vazkii.botania.client.render.block.RenderAvatar;
import vazkii.botania.client.render.block.RenderBellows;
import vazkii.botania.client.render.block.RenderBrewery;
import vazkii.botania.client.render.block.RenderCocoon;
import vazkii.botania.client.render.block.RenderCorporeaCrystalCube;
import vazkii.botania.client.render.block.RenderCorporeaIndex;
import vazkii.botania.client.render.block.RenderDoubleFlower;
import vazkii.botania.client.render.block.RenderFloatingFlower;
import vazkii.botania.client.render.block.RenderHourglass;
import vazkii.botania.client.render.block.RenderIncensePlate;
import vazkii.botania.client.render.block.RenderPool;
import vazkii.botania.client.render.block.RenderPump;
import vazkii.botania.client.render.block.RenderPylon;
import vazkii.botania.client.render.block.RenderSpawnerClaw;
import vazkii.botania.client.render.block.RenderSpecialFlower;
import vazkii.botania.client.render.block.RenderSpreader;
import vazkii.botania.client.render.block.RenderTeruTeruBozu;
import vazkii.botania.client.render.block.RenderTinyPotato;
import vazkii.botania.client.render.entity.RenderBabylonWeapon;
import vazkii.botania.client.render.entity.RenderCorporeaSpark;
import vazkii.botania.client.render.entity.RenderDoppleganger;
@@ -332,12 +312,12 @@ public class ClientProxy extends CommonProxy {
ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride());
RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie());
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(ModItems.vineBall));
RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger());
RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark());
RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram());
RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark());
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(ModItems.manaResource, 15));
RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem()));
RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart());
RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither());
RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm());
@@ -411,12 +391,12 @@ public class ClientProxy extends CommonProxy {
}
@Override
public void playRecordClientSided(World world, int x, int y, int z, ItemRecord record) {
public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {
Minecraft mc = Minecraft.getMinecraft();
if(record == null)
world.playAuxSFXAtEntity(null, 1005, x, y, z, 0);
world.playAuxSFXAtEntity(null, 1005, pos, 0);
else {
world.playAuxSFXAtEntity(null, 1005, x, y, z, Item.getIdFromItem(record));
world.playAuxSFXAtEntity(null, 1005, pos, Item.getIdFromItem(record));
mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal());
}
}
@@ -16,6 +16,7 @@ import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemRecord;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.BlockPos;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
@@ -210,7 +211,7 @@ public class CommonProxy {
return false;
}
public void playRecordClientSided(World world, int x, int y, int z, ItemRecord record) {
public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {
// NO-OP
}
@@ -475,7 +475,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
@Override
public void setDead() {
BlockPos source = getSource();
Botania.proxy.playRecordClientSided(worldObj, source.posX, source.posY, source.posZ, null);
Botania.proxy.playRecordClientSided(worldObj, , source.posX, null);
isPlayingMusic = false;
super.setDead();
}
@@ -524,7 +524,7 @@ public class EntityDoppleganger extends EntityCreature implements IBotaniaBossWi
int playerCount = getPlayerCount();
if(worldObj.isRemote && !isPlayingMusic && !isDead && !players.isEmpty()) {
Botania.proxy.playRecordClientSided(worldObj, source.posX, source.posY, source.posZ, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1));
Botania.proxy.playRecordClientSided(worldObj, , source.posX, (ItemRecord) (hard ? ModItems.recordGaia2 : ModItems.recordGaia1));
isPlayingMusic = true;
}