Rune Altar multiplayer fixes + fanciness.

This commit is contained in:
Vasco Lavos committed 2014-02-15 18:29:49 +00:00
1 parent f57c82e3f3
commit 9c5da95e1d
4 files changed
+99 -13

No files matched your search

@@ -12,6 +12,7 @@
package vazkii.botania.client.core.helper;
import java.util.List;
import java.util.Random;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
@@ -56,7 +57,7 @@ public final class RenderHelper {
int var9 = 8;
if (tooltipData.size() > 1)
var9 += 2 + (tooltipData.size() - 1) * 10;
float z = 300.0F;
float z = 300F;
drawGradientRect(var6 - 3, var7 - 4, z, var6 + var5 + 3, var7 - 3, color2, color2);
drawGradientRect(var6 - 3, var7 + var9 + 3, z, var6 + var5 + 3, var7 + var9 + 4, color2, color2);
drawGradientRect(var6 - 3, var7 - 3, z, var6 + var5 + 3, var7 + var9 + 3, color2, color2);
@@ -82,14 +83,14 @@ public final class RenderHelper {
}
public static void drawGradientRect(int par1, int par2, float z, int par3, int par4, int par5, int par6) {
float var7 = (par5 >> 24 & 255) / 255.0F;
float var8 = (par5 >> 16 & 255) / 255.0F;
float var9 = (par5 >> 8 & 255) / 255.0F;
float var10 = (par5 & 255) / 255.0F;
float var11 = (par6 >> 24 & 255) / 255.0F;
float var12 = (par6 >> 16 & 255) / 255.0F;
float var13 = (par6 >> 8 & 255) / 255.0F;
float var14 = (par6 & 255) / 255.0F;
float var7 = (par5 >> 24 & 255) / 255F;
float var8 = (par5 >> 16 & 255) / 255F;
float var9 = (par5 >> 8 & 255) / 255F;
float var10 = (par5 & 255) / 255F;
float var11 = (par6 >> 24 & 255) / 255F;
float var12 = (par6 >> 16 & 255) / 255F;
float var13 = (par6 >> 8 & 255) / 255F;
float var14 = (par6 & 255) / 255F;
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -121,4 +122,59 @@ public final class RenderHelper {
tessellator.addVertexWithUV(par1 + 0, par2 + 0, z, (par3 + 0) * f, (par4 + 0) * f1);
tessellator.draw();
}
public static void renderStar(int color, float xScale, float yScale, float zScale, long seed) {
Tessellator tessellator = Tessellator.instance;
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
int ticks = (int) (Minecraft.getMinecraft().theWorld.getTotalWorldTime() % 200);
if (ticks >= 100)
ticks = 200 - ticks - 1;
float f1 = (float) ticks / 200F;
float f2 = 0F;
if (f1 > 0.7F)
f2 = (f1 - 0.7F) / 0.2F;
Random random = new Random(seed);
GL11.glPushMatrix();
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glShadeModel(GL11.GL_SMOOTH);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(770, 1);
GL11.glDisable(GL11.GL_ALPHA_TEST);
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glDepthMask(false);
GL11.glTranslatef(0F, -1F, -2F);
GL11.glScalef(xScale, yScale, zScale);
for (int i = 0; i < (f1 + f1 * f1) / 2F * 90F + 30F; i++) {
GL11.glRotatef(random.nextFloat() * 360F, 1F, 0F, 0F);
GL11.glRotatef(random.nextFloat() * 360F, 0F, 1F, 0F);
GL11.glRotatef(random.nextFloat() * 360F, 0F, 0F, 1F);
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);
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.addVertex(0, 0, 0);
tessellator.setColorRGBA_F(0F, 0F, 0F, 0);
tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4);
tessellator.addVertex(0.866D * f4, f3, -0.5F * f4);
tessellator.addVertex(0, f3, 1F * f4);
tessellator.addVertex(-0.866D * f4, f3, -0.5F * f4);
tessellator.draw();
}
GL11.glDepthMask(true);
GL11.glDisable(GL11.GL_CULL_FACE);
GL11.glDisable(GL11.GL_BLEND);
GL11.glShadeModel(GL11.GL_FLAT);
GL11.glColor4f(1F, 1F, 1F, 1F);
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glEnable(GL11.GL_ALPHA_TEST);
GL11.glPopMatrix();
}
}
@@ -29,6 +29,7 @@ import net.minecraftforge.client.ForgeHooksClient;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.helper.RenderHelper;
import vazkii.botania.client.model.ModelSpinningCubes;
import vazkii.botania.common.block.tile.TileRuneAltar;
@@ -89,12 +90,21 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer {
}
GL11.glPushMatrix();
GL11.glTranslated(0.5, 1.8, 0.5);
GL11.glTranslatef(0.5F, 1.8F, 0.5F);
GL11.glRotatef(180F, 1F, 0F, 1F);
int repeat = 15;
cubes.renderSpinningCubes(2, repeat, repeat);
GL11.glPopMatrix();
GL11.glTranslatef(0F, 1.2F, 2F);
float scale = altar.getTargetMana() == 0 ? 0 : (float) altar.getCurrentMana() / (float) altar.getTargetMana() / 75F;
if(scale != 0) {
int seed = altar.xCoord ^ altar.yCoord ^ altar.zCoord;
GL11.glTranslatef(0.5F, 0.7F, 0.5F);
RenderHelper.renderStar(0x00E4D7, scale, scale, scale, seed);
}
GL11.glPopMatrix();
}
}
@@ -14,7 +14,6 @@ package vazkii.botania.common.block.subtile.generating;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.subtile.SubTileGenerating;
import vazkii.botania.common.lexicon.LexiconData;
import vazkii.botania.common.lib.LibLexicon;
public class SubTileDaybloom extends SubTileGenerating {
@@ -17,6 +17,7 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.mana.IManaReceiver;
@@ -30,6 +31,8 @@ import cpw.mods.fml.common.network.PacketDispatcher;
public class TileRuneAltar extends TileSimpleInventory implements ISidedInventory, IManaReceiver {
private static final String TAG_MANA = "mana";
public float[] angles = new float[getSizeInventory()];
boolean firstTick = true;
int manaToGet = 0;
@@ -87,6 +90,7 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
Botania.proxy.lightningFX(worldObj, vec, endVec, 2F, 0x00948B, 0x00E4D7);
}
}
}
@Override
@@ -180,7 +184,20 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
}
}
@Override
public void writeCustomNBT(NBTTagCompound par1nbtTagCompound) {
super.writeCustomNBT(par1nbtTagCompound);
par1nbtTagCompound.setInteger(TAG_MANA, mana);
}
@Override
public void readCustomNBT(NBTTagCompound par1nbtTagCompound) {
super.readCustomNBT(par1nbtTagCompound);
mana = par1nbtTagCompound.getInteger(TAG_MANA);
}
@Override
public int getSizeInventory() {
return 16;
@@ -235,5 +252,9 @@ public class TileRuneAltar extends TileSimpleInventory implements ISidedInventor
public boolean canRecieveManaFromBursts() {
return !isFull();
}
public int getTargetMana() {
return manaToGet;
}
}