mirror of
https://git.webmc.xyz/Starlike-Client/Starlike-Client
synced 2025-07-21 13:11:17 -09:00
git
This commit is contained in:
parent
7dd2b7da62
commit
eec0de9e01
@ -5,7 +5,7 @@ import java.util.List;
|
|||||||
|
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
|
import net.starlikeclient.minecraft.util.EnergyStats;
|
||||||
import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
|
import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID;
|
||||||
import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
@ -186,6 +186,7 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
|
|||||||
* + The food object of the player, the general hunger logic.
|
* + The food object of the player, the general hunger logic.
|
||||||
*/
|
*/
|
||||||
protected FoodStats foodStats = new FoodStats();
|
protected FoodStats foodStats = new FoodStats();
|
||||||
|
protected EnergyStats energyStats = new EnergyStats();
|
||||||
protected int flyToggleTimer;
|
protected int flyToggleTimer;
|
||||||
public float prevCameraYaw;
|
public float prevCameraYaw;
|
||||||
public float cameraYaw;
|
public float cameraYaw;
|
||||||
@ -2019,6 +2020,7 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS
|
|||||||
switch (itemStackIn.getItemUseAction()) {
|
switch (itemStackIn.getItemUseAction()) {
|
||||||
case DRINK:
|
case DRINK:
|
||||||
this.playSound("random.drink", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F);
|
this.playSound("random.drink", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F);
|
||||||
|
energyStats.addEnergy(itemStackIn.getEnergyStat());
|
||||||
break;
|
break;
|
||||||
case EAT:
|
case EAT:
|
||||||
for (int i = 0; i < parInt1; ++i) {
|
for (int i = 0; i < parInt1; ++i) {
|
||||||
|
@ -71,6 +71,14 @@ import net.starlikeclient.minecraft.init.ItemsStarlike;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class Item {
|
public class Item {
|
||||||
|
private int energyStat = 0;
|
||||||
|
public int getEnergyStat(){
|
||||||
|
return energyStat;
|
||||||
|
}
|
||||||
|
public void setEnergyStat(int stat){
|
||||||
|
energyStat = stat;
|
||||||
|
}
|
||||||
|
|
||||||
public static enum ToolMaterial {
|
public static enum ToolMaterial {
|
||||||
// MATERIAL(HARVEST_LEVEL, DURABILITY, EFFICIENCY, DAMAGE, ENCHANTABILITY)
|
// MATERIAL(HARVEST_LEVEL, DURABILITY, EFFICIENCY, DAMAGE, ENCHANTABILITY)
|
||||||
ZERO(0, 0, 0.0F, 0.0F, 0), WOOD(0, 59, 2.0F, 0.0F, 15), STONE(1, 131, 4.0F, 1.0F, 5),
|
ZERO(0, 0, 0.0F, 0.0F, 0), WOOD(0, 59, 2.0F, 0.0F, 15), STONE(1, 131, 4.0F, 1.0F, 5),
|
||||||
|
@ -74,6 +74,7 @@ public class ItemPotion extends Item {
|
|||||||
this.setHasSubtypes(true);
|
this.setHasSubtypes(true);
|
||||||
this.setMaxDamage(0);
|
this.setMaxDamage(0);
|
||||||
this.setCreativeTab(CreativeTabs.tabBrewing);
|
this.setCreativeTab(CreativeTabs.tabBrewing);
|
||||||
|
this.setEnergyStat(3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -691,6 +691,9 @@ public final class ItemStack {
|
|||||||
: (!this.stackTagCompound.hasKey("display", 10) ? false
|
: (!this.stackTagCompound.hasKey("display", 10) ? false
|
||||||
: this.stackTagCompound.getCompoundTag("display").hasKey("Name", 8));
|
: this.stackTagCompound.getCompoundTag("display").hasKey("Name", 8));
|
||||||
}
|
}
|
||||||
|
public int getEnergyStat(){
|
||||||
|
return this.item.getEnergyStat();
|
||||||
|
}
|
||||||
|
|
||||||
public boolean hasEffect() {
|
public boolean hasEffect() {
|
||||||
return this.getItem().hasEffect(this);
|
return this.getItem().hasEffect(this);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user