Refactor of XP stuff to use it in all the places.

This commit is contained in:
CrazyPants committed 2014-09-14 01:16:12 +08:00
1 parent a1152d5316
commit e8319e20a2
12 files changed
+346 -242

No files matched your search

@@ -24,6 +24,8 @@ import crazypants.enderio.machine.tank.BlockTank;
import crazypants.enderio.machine.tank.PacketTank;
import crazypants.enderio.machine.tank.TileTank;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.xp.PacketExperianceContainer;
import crazypants.enderio.xp.PacketGiveXP;
import crazypants.util.FluidUtil;
import crazypants.util.Util;
@@ -36,9 +38,9 @@ public class BlockKillerJoe extends AbstractMachineBlock<TileKillerJoe> {
public static BlockKillerJoe create() {
PacketHandler.INSTANCE.registerMessage(PacketNutrientLevel.class, PacketNutrientLevel.class, PacketHandler.nextID(), Side.CLIENT);
PacketHandler.INSTANCE.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT);
PacketHandler.INSTANCE.registerMessage(PacketExperianceTotal.class, PacketExperianceTotal.class, PacketHandler.nextID(), Side.CLIENT);
PacketHandler.INSTANCE.registerMessage(PacketUseXP.class, PacketUseXP.class, PacketHandler.nextID(), Side.SERVER);
PacketHandler.INSTANCE.registerMessage(PacketSwing.class, PacketSwing.class, PacketHandler.nextID(), Side.CLIENT);
PacketGiveXP.register();
PacketExperianceContainer.register();
BlockKillerJoe res = new BlockKillerJoe();
MinecraftForge.EVENT_BUS.register(res);
@@ -20,6 +20,7 @@ import crazypants.enderio.machine.generator.zombie.ContainerZombieGenerator;
import crazypants.enderio.machine.generator.zombie.TileZombieGenerator;
import crazypants.enderio.machine.power.PowerDisplayUtil;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.xp.PacketGiveXP;
import crazypants.gui.GuiToolTip;
import crazypants.render.ColorUtil;
import crazypants.render.RenderUtil;
@@ -70,9 +71,9 @@ public class GuiKillerJoe extends GuiMachineBase {
protected void actionPerformed(GuiButton b) {
super.actionPerformed(b);
if(b.id == XP_ID) {
PacketHandler.INSTANCE.sendToServer(new PacketUseXP(joe, 1));
PacketHandler.INSTANCE.sendToServer(new PacketGiveXP(joe, 1));
} else if(b.id == XP10_ID) {
PacketHandler.INSTANCE.sendToServer(new PacketUseXP(joe, 10));
PacketHandler.INSTANCE.sendToServer(new PacketGiveXP(joe, 10));
}
}
@@ -114,12 +115,12 @@ public class GuiKillerJoe extends GuiMachineBase {
RenderUtil.renderGuiTank(joe.fuelTank.getFluid(), joe.fuelTank.getCapacity(), joe.fuelTank.getFluidAmount(), x, y, zLevel, 15, 47);
}
String s = joe.experienceLevel + "";
String s = joe.getContainer().getExperienceLevel() + "";
drawCenteredString(Minecraft.getMinecraft().fontRenderer, s, sx + xSize/2, sy + 50, 8453920);
RenderUtil.bindTexture("enderio:textures/gui/killerJoe.png");
GL11.glColor3f(1, 1, 1);
int xpScaled = joe.getXpBarScaled(63);
int xpScaled = joe.getContainer().getXpBarScaled(63);
drawTexturedModalRect(sx + 56, sy + 62, 192, 0, xpScaled, 3);
@@ -1,51 +0,0 @@
package crazypants.enderio.machine.killera;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import io.netty.buffer.ByteBuf;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.NetworkUtil;
public class PacketExperianceTotal extends MessageTileEntity<TileKillerJoe> implements IMessageHandler<PacketExperianceTotal, IMessage> {
private int level;
private float exp;
public PacketExperianceTotal() {
}
public PacketExperianceTotal(TileKillerJoe tile) {
super(tile);
level = tile.experienceLevel;
exp = tile.experience;
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeInt(level);
buf.writeFloat(exp);
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
level = buf.readInt();
exp = buf.readFloat();
}
@Override
public IMessage onMessage(PacketExperianceTotal message, MessageContext ctx) {
EntityPlayer player = EnderIO.proxy.getClientPlayer();
TileKillerJoe tile = message.getTileEntity(player.worldObj);
if (tile != null) {
tile.experienceLevel = message.level;
tile.experience = message.exp;
}
return null;
}
}
@@ -1,47 +0,0 @@
package crazypants.enderio.machine.killera;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.MessageTileEntity;
public class PacketUseXP extends MessageTileEntity<TileKillerJoe> implements IMessageHandler<PacketUseXP, IMessage> {
int levels;
public PacketUseXP() {
}
public PacketUseXP(TileKillerJoe tile, int levels) {
super(tile);
this.levels = levels;
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeShort((short)levels);
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
levels = buf.readShort();
}
@Override
public IMessage onMessage(PacketUseXP message, MessageContext ctx) {
EntityPlayer player = ctx.getServerHandler().playerEntity;
TileKillerJoe tile = message.getTileEntity(player.worldObj);
if (tile != null) {
tile.givePlayerXp(player, message.levels);
}
return null;
}
}
@@ -32,18 +32,21 @@ import com.mojang.authlib.GameProfile;
import crazypants.enderio.EnderIO;
import crazypants.enderio.ModObject;
import crazypants.enderio.config.Config;
import crazypants.enderio.fluid.LiquidXpUtil;
import crazypants.enderio.machine.AbstractMachineEntity;
import crazypants.enderio.machine.SlotDefinition;
import crazypants.enderio.machine.generator.zombie.NutrientTank;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.xp.ExperienceContainer;
import crazypants.enderio.xp.IHaveExperience;
import crazypants.enderio.xp.PacketExperianceContainer;
import crazypants.enderio.xp.XpUtil;
import crazypants.render.BoundingBox;
import crazypants.util.BlockCoord;
import crazypants.util.FluidUtil;
import crazypants.util.ForgeDirectionOffsets;
import crazypants.vecmath.Vector3d;
public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector {
public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandler, IEntitySelector, IHaveExperience {
private static int IO_MB_TICK = 250;
@@ -66,14 +69,8 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
private float swingProgress;
private float prevSwingProgress;
int experienceLevel;
float experience;
private boolean xpDirty;
private int experienceTotal;
private ExperienceContainer xpCon = new ExperienceContainer();
public TileKillerJoe() {
super(new SlotDefinition(1, 0, 0));
@@ -109,6 +106,11 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
super.updateEntity();
}
@Override
public ExperienceContainer getContainer() {
return xpCon;
}
@Override
protected boolean processTasks(boolean redstoneCheckPassed) {
@@ -124,9 +126,9 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
PacketHandler.sendToAllAround(new PacketNutrientLevel(this), this);
tanksDirty = false;
}
if(xpDirty) {
PacketHandler.sendToAllAround(new PacketExperianceTotal(this), this);
xpDirty = false;
if(xpCon.isDirty()) {
PacketHandler.sendToAllAround(new PacketExperianceContainer(this), this);
xpCon.setDirty(false);
}
if(fuelTank.getFluidAmount() < fuelTank.getCapacity() * 0.7f) {
@@ -160,82 +162,8 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
//------------------------------- XP
public void addExperience(int xpToAdd) {
int j = Integer.MAX_VALUE - this.experienceTotal;
if(xpToAdd > j) {
xpToAdd = j;
}
experience += (float) xpToAdd / (float) getXpBarCapacity();
experienceTotal += xpToAdd;
for (; experience >= 1.0F; experience /= (float) getXpBarCapacity()) {
experience = (experience - 1.0F) * (float) getXpBarCapacity();
experienceLevel++;
}
xpDirty = true;
}
private int getXpBarCapacity(int level) {
return level >= 30 ? 62 + (level - 30) * 7 : (level >= 15 ? 17 + (level - 15) * 3 : 17);
}
private int getXpBarCapacity() {
return getXpBarCapacity(experienceLevel);
}
public int getXpBarScaled(int scale) {
int result = (int) (experience * scale);
return result;
}
public void givePlayerXp(EntityPlayer player, int levels) {
for(int i=0;i<levels && experienceTotal > 0; i++) {
givePlayerXp(player);
}
}
public void givePlayerXp(EntityPlayer player) {
if(Config.killerJoeGivePlayerLevelXP) {
int currentXP = getPlayerXP(player);
int nextLevelXP = getExperienceForLevel(player.experienceLevel + 1) + 1;
int requiredXP = nextLevelXP - currentXP;
requiredXP = Math.min(experienceTotal, requiredXP);
player.addExperience(requiredXP);
int newXp = experienceTotal - requiredXP;
experience = 0;
experienceLevel = 0;
experienceTotal = 0;
addExperience(newXp);
} else {
int takeXp = Math.min(getXpBarCapacity(), experienceTotal);
player.addExperience(takeXp);
int newXp = experienceTotal - takeXp;
experience = 0;
experienceLevel = 0;
experienceTotal = 0;
addExperience(newXp);
}
}
private int getPlayerXP(EntityPlayer player) {
return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap()));
}
private int getExperienceForLevel(int level) {
if(level == 0) {
return 0;
}
if(level > 0 && level < 16) {
return level * 17;
} else if(level > 15 && level < 31) {
return (int) (1.5 * Math.pow(level, 2) - 29.5 * level + 360);
} else {
return (int) (3.5 * Math.pow(level, 2) - 151.5 * level + 2220);
}
public ExperienceContainer getXpContainer() {
return xpCon;
}
private void hooverXP() {
@@ -271,7 +199,7 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
private void hooverXP(EntityXPOrb entity) {
if(!worldObj.isRemote) {
if(!entity.isDead) {
addExperience(entity.getXpValue());
xpCon.addExperience(entity.getXpValue());
entity.setDead();
}
}
@@ -461,29 +389,17 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
if(resource == null || !canDrain(from, resource.getFluid())) {
return null;
}
return drain(from, resource.amount, doDrain);
return xpCon.drain(from, resource, doDrain);
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
int available = LiquidXpUtil.XPToLiquidRatio(experienceTotal);
int canDrain = Math.min(available, maxDrain);
if(doDrain) {
int newXp = experienceTotal - LiquidXpUtil.liquidToXPRatio(canDrain);
experience = 0;
experienceLevel = 0;
experienceTotal = 0;
addExperience(newXp);
}
return new FluidStack(EnderIO.fluidXpJuice, canDrain);
return xpCon.drain(from, maxDrain, doDrain);
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return fluid != null && fluid.getID() == EnderIO.fluidXpJuice.getID();
return xpCon.canDrain(from, fluid);
}
//------------------------------- Save / Load
@@ -502,9 +418,10 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
fuelTank.setFluid(null);
}
experienceLevel = nbtRoot.getInteger("experienceLevel");
experienceTotal = nbtRoot.getInteger("experienceTotal");
experience = nbtRoot.getFloat("experience");
// experienceLevel = nbtRoot.getInteger("experienceLevel");
// experienceTotal = nbtRoot.getInteger("experienceTotal");
// experience = nbtRoot.getFloat("experience");
xpCon.readFromNBT(nbtRoot);
}
@Override
@@ -516,9 +433,10 @@ public class TileKillerJoe extends AbstractMachineEntity implements IFluidHandle
nbtRoot.setTag("fuelTank", tankRoot);
}
nbtRoot.setInteger("experienceLevel", experienceLevel);
nbtRoot.setInteger("experienceTotal", experienceTotal);
nbtRoot.setFloat("experience", experience);
// nbtRoot.setInteger("experienceLevel", experienceLevel);
// nbtRoot.setInteger("experienceTotal", experienceTotal);
// nbtRoot.setFloat("experience", experience);
xpCon.writeToNBT(nbtRoot);
}
@@ -17,17 +17,17 @@ import cpw.mods.fml.relauncher.SideOnly;
import crazypants.enderio.EnderIO;
import crazypants.enderio.EnderIOTab;
import crazypants.enderio.ModObject;
import crazypants.enderio.fluid.LiquidXpUtil;
import crazypants.enderio.gui.IResourceTooltipProvider;
import crazypants.enderio.item.PacketConduitProbe;
import crazypants.enderio.network.PacketHandler;
import crazypants.enderio.xp.XpUtil;
import crazypants.util.Util;
import crazypants.vecmath.Vector3d;
public class ItemXpTransfer extends Item implements IResourceTooltipProvider {
public static ItemXpTransfer create() {
PacketHandler.INSTANCE.registerMessage(PacketXpTransfer.class, PacketXpTransfer.class, PacketHandler.nextID(), Side.CLIENT);
PacketHandler.INSTANCE.registerMessage(PacketXpTransferEffects.class, PacketXpTransferEffects.class, PacketHandler.nextID(), Side.CLIENT);
ItemXpTransfer result = new ItemXpTransfer();
result.init();
@@ -61,7 +61,7 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider {
double yP = player.posY + 1.5;
double zP = player.posZ + look.z;
TargetPoint tp = new TargetPoint(player.dimension, x, y, z, 32);
EnderIO.packetPipeline.INSTANCE.sendTo(new PacketXpTransfer(swing, xP, yP, zP), (EntityPlayerMP)player);
EnderIO.packetPipeline.INSTANCE.sendTo(new PacketXpTransferEffects(swing, xP, yP, zP), (EntityPlayerMP)player);
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.orb", 0.1F, 0.5F * ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.8F));
}
return res;
@@ -77,18 +77,18 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider {
if(!fh.canDrain(dir, EnderIO.fluidXpJuice)) {
return false;
}
int currentXP = LiquidXpUtil.getPlayerXP(player);
int nextLevelXP = LiquidXpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1;
int currentXP = XpUtil.getPlayerXP(player);
int nextLevelXP = XpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1;
int requiredXP = nextLevelXP - currentXP;
int fluidVolume = LiquidXpUtil.XPToLiquidRatio(requiredXP);
int fluidVolume = XpUtil.experianceToLiquid(requiredXP);
FluidStack fs = new FluidStack(EnderIO.fluidXpJuice, fluidVolume);
FluidStack res = fh.drain(dir, fs, true);
if(res == null || res.amount <= 0) {
return false;
}
int xpToGive = LiquidXpUtil.liquidToXPRatio(res.amount);
int xpToGive = XpUtil.liquidToExperiance(res.amount);
player.addExperience(xpToGive);
return true;
@@ -109,14 +109,14 @@ public class ItemXpTransfer extends Item implements IResourceTooltipProvider {
return false;
}
int fluidVolume = LiquidXpUtil.XPToLiquidRatio(LiquidXpUtil.getPlayerXP(player));
int fluidVolume = XpUtil.experianceToLiquid(XpUtil.getPlayerXP(player));
FluidStack fs = new FluidStack(EnderIO.fluidXpJuice, fluidVolume);
int takenVolume = fh.fill(dir, fs, true);
if(takenVolume <= 0) {
return false;
}
int xpToTake = LiquidXpUtil.liquidToXPRatio(takenVolume);
LiquidXpUtil.addPlayerXP(player, -xpToTake);
int xpToTake = XpUtil.liquidToExperiance(takenVolume);
XpUtil.addPlayerXP(player, -xpToTake);
return true;
}
@@ -11,21 +11,21 @@ import crazypants.enderio.EnderIO;
import crazypants.util.Util;
import crazypants.vecmath.Vector3d;
public class PacketXpTransfer implements IMessage, IMessageHandler<PacketXpTransfer, IMessage> {
public class PacketXpTransferEffects implements IMessage, IMessageHandler<PacketXpTransferEffects, IMessage> {
boolean swing;
double x;
double y;
double z;
public PacketXpTransfer(boolean swing, double x, double y, double z) {
public PacketXpTransferEffects(boolean swing, double x, double y, double z) {
this.swing = swing;
this.x = x;
this.y = y;
this.z = z;
}
public PacketXpTransfer() {
public PacketXpTransferEffects() {
}
@Override
@@ -45,7 +45,7 @@ public class PacketXpTransfer implements IMessage, IMessageHandler<PacketXpTrans
}
@Override
public IMessage onMessage(PacketXpTransfer message, MessageContext ctx) {
public IMessage onMessage(PacketXpTransferEffects message, MessageContext ctx) {
EntityPlayer player = EnderIO.proxy.getClientPlayer();
if(player != null) {
int particleCount = 1;
@@ -0,0 +1,151 @@
package crazypants.enderio.xp;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import crazypants.enderio.EnderIO;
import crazypants.enderio.config.Config;
public class ExperienceContainer {
private int experienceLevel;
private float experience;
private int experienceTotal;
private boolean xpDirty;
private final int maxXp;
public ExperienceContainer() {
this(Integer.MAX_VALUE);
}
public ExperienceContainer(int maxStored) {
maxXp = maxStored;
}
public int getExperienceLevel() {
return experienceLevel;
}
public float getExperience() {
return experience;
}
public int getExperienceTotal() {
return experienceTotal;
}
public boolean isDirty() {
return xpDirty;
}
public void setDirty(boolean isDirty) {
xpDirty = isDirty;
}
public void set(ExperienceContainer xpCon) {
experienceTotal = xpCon.experienceTotal;
experienceLevel = xpCon.experienceLevel;
experience = xpCon.experience;
}
public void addExperience(int xpToAdd) {
int j = maxXp - experienceTotal;
if(xpToAdd > j) {
xpToAdd = j;
}
experience += (float) xpToAdd / (float) getXpBarCapacity();
experienceTotal += xpToAdd;
for (; experience >= 1.0F; experience /= (float) getXpBarCapacity()) {
experience = (experience - 1.0F) * (float) getXpBarCapacity();
experienceLevel++;
}
xpDirty = true;
}
private int getXpBarCapacity() {
return XpUtil.getXpBarCapacity(experienceLevel);
}
public int getXpBarScaled(int scale) {
int result = (int) (experience * scale);
return result;
}
public void givePlayerXp(EntityPlayer player, int levels) {
for (int i = 0; i < levels && experienceTotal > 0; i++) {
givePlayerXp(player);
}
}
public void givePlayerXp(EntityPlayer player) {
int currentXP = XpUtil.getPlayerXP(player);
int nextLevelXP = XpUtil.getExperienceForLevel(player.experienceLevel + 1) + 1;
int requiredXP = nextLevelXP - currentXP;
requiredXP = Math.min(experienceTotal, requiredXP);
player.addExperience(requiredXP);
int newXp = experienceTotal - requiredXP;
experience = 0;
experienceLevel = 0;
experienceTotal = 0;
addExperience(newXp);
}
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
if(resource == null || !canDrain(from, resource.getFluid())) {
return null;
}
return drain(from, resource.amount, doDrain);
}
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
int available = XpUtil.experianceToLiquid(experienceTotal);
int canDrain = Math.min(available, maxDrain);
if(doDrain) {
int newXp = experienceTotal - XpUtil.liquidToExperiance(canDrain);
experience = 0;
experienceLevel = 0;
experienceTotal = 0;
addExperience(newXp);
}
return new FluidStack(EnderIO.fluidXpJuice, canDrain);
}
public boolean canDrain(ForgeDirection from, Fluid fluid) {
return fluid != null && fluid.getID() == EnderIO.fluidXpJuice.getID();
}
public void readFromNBT(NBTTagCompound nbtRoot) {
experienceLevel = nbtRoot.getInteger("experienceLevel");
experienceTotal = nbtRoot.getInteger("experienceTotal");
experience = nbtRoot.getFloat("experience");
}
public void writeToNBT(NBTTagCompound nbtRoot) {
nbtRoot.setInteger("experienceLevel", experienceLevel);
nbtRoot.setInteger("experienceTotal", experienceTotal);
nbtRoot.setFloat("experience", experience);
}
public void toBytes(ByteBuf buf) {
buf.writeInt(experienceTotal);
buf.writeInt(experienceLevel);
buf.writeFloat(experience);
}
public void fromBytes(ByteBuf buf) {
experienceTotal = buf.readInt();
experienceLevel = buf.readInt();
experience = buf.readFloat();
}
}
@@ -0,0 +1,7 @@
package crazypants.enderio.xp;
public interface IHaveExperience {
ExperienceContainer getContainer();
}
@@ -0,0 +1,59 @@
package crazypants.enderio.xp;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.EnderIO;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.PacketHandler;
public class PacketExperianceContainer extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketExperianceContainer, IMessage> {
private static boolean registered = false;
public static void register() {
if(!registered) {
PacketHandler.INSTANCE.registerMessage(PacketExperianceContainer.class, PacketExperianceContainer.class, PacketHandler.nextID(), Side.CLIENT);
registered = true;
}
}
private ExperienceContainer xpCon;
public PacketExperianceContainer() {
xpCon = new ExperienceContainer();
}
public PacketExperianceContainer(TileEntity tile) {
super(tile);
IHaveExperience xpTile = (IHaveExperience)tile;
xpCon = xpTile.getContainer();
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
xpCon.toBytes(buf);
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
xpCon.fromBytes(buf);
}
@Override
public IMessage onMessage(PacketExperianceContainer message, MessageContext ctx) {
EntityPlayer player = EnderIO.proxy.getClientPlayer();
TileEntity tile = message.getTileEntity(player.worldObj);
if (tile instanceof IHaveExperience) {
IHaveExperience xpTile = (IHaveExperience)tile;
xpTile.getContainer().set(message.xpCon);
}
return null;
}
}
@@ -0,0 +1,58 @@
package crazypants.enderio.xp;
import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
import cpw.mods.fml.relauncher.Side;
import crazypants.enderio.network.MessageTileEntity;
import crazypants.enderio.network.PacketHandler;
public class PacketGiveXP extends MessageTileEntity<TileEntity> implements IMessageHandler<PacketGiveXP, IMessage> {
private static boolean isRegistered = false;
public static void register() {
if(!isRegistered) {
PacketHandler.INSTANCE.registerMessage(PacketGiveXP.class, PacketGiveXP.class, PacketHandler.nextID(), Side.SERVER);
isRegistered = true;
}
}
int levels;
public PacketGiveXP() {
}
public PacketGiveXP(TileEntity tile, int levels) {
super(tile);
this.levels = levels;
}
@Override
public void toBytes(ByteBuf buf) {
super.toBytes(buf);
buf.writeShort((short)levels);
}
@Override
public void fromBytes(ByteBuf buf) {
super.fromBytes(buf);
levels = buf.readShort();
}
@Override
public IMessage onMessage(PacketGiveXP message, MessageContext ctx) {
EntityPlayer player = ctx.getServerHandler().playerEntity;
TileEntity tile = message.getTileEntity(player.worldObj);
if (tile instanceof IHaveExperience) {
IHaveExperience xpTile = (IHaveExperience)tile;
xpTile.getContainer().givePlayerXp(player, message.levels);
}
return null;
}
}
@@ -1,4 +1,4 @@
package crazypants.enderio.fluid;
package crazypants.enderio.xp;
import net.minecraft.entity.player.EntityPlayer;
@@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
* @see {@link https://github.com/OpenMods/OpenModsLib/blob/master/src/main/java/openmods/utils/EnchantmentUtils.java}
*
*/
public class LiquidXpUtil {
public class XpUtil {
//Values taken from OpenBlocks to ensure compatibility
@@ -16,16 +16,16 @@ public class LiquidXpUtil {
public static final int LIQUID_PER_XP_BOTTLE = XP_PER_BOTTLE * RATIO;
public static int liquidToXPRatio(int liquid) {
public static int liquidToExperiance(int liquid) {
return liquid / RATIO;
}
public static int XPToLiquidRatio(int xp) {
public static int experianceToLiquid(int xp) {
return xp * RATIO;
}
public static int getLiquidForLevel(int level) {
return XPToLiquidRatio(getExperienceForLevel(level));
return experianceToLiquid(getExperienceForLevel(level));
}
public static int getExperienceForLevel(int level) {
@@ -38,6 +38,18 @@ public class LiquidXpUtil {
return (int)(3.5 * Math.pow(level, 2) - 151.5 * level + 2220);
}
}
public static int getXpBarCapacity(int level) {
return level >= 30 ? 62 + (level - 30) * 7 : (level >= 15 ? 17 + (level - 15) * 3 : 17);
}
public static int getLevelForExperience(int experience) {
int i = 0;
while (getExperienceForLevel(i) <= experience) {
i++;
}
return i - 1;
}
public static int getPlayerXP(EntityPlayer player) {
return (int) (getExperienceForLevel(player.experienceLevel) + (player.experience * player.xpBarCap()));
@@ -51,12 +63,6 @@ public class LiquidXpUtil {
player.experience = (float)(experience - expForLevel) / (float)player.xpBarCap();
}
public static int getLevelForExperience(int experience) {
int i = 0;
while (getExperienceForLevel(i) <= experience) {
i++;
}
return i - 1;
}
}