EaglerArchive/Starlike-Client
1
0
Fork 0
mirror of https://git.webmc.xyz/Starlike-Client/Starlike-Client synced 2025-06-05 18:32:01 -09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "git"

Browse Source 
This reverts commit eec0de9e01765d1abf52d21a6fe60a360e6252d7.
This commit is contained in:
SpeedSlicer 2025-03-12 13:28:29 -04:00
parent eec0de9e01
commit 0aa18b7e06
No known key found for this signature in database
GPG Key ID: 926D5B87A0993ED5
4 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/java/net/minecraft/entity/player/EntityPlayer.java
View File

@ -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,7 +186,6 @@ 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;
@ -2020,7 +2019,6 @@ 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) {

10
src/game/java/net/minecraft/item/Item.java
View File

@ -71,14 +71,6 @@ 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),
@ -93,7 +85,7 @@ public class Item {
private final float efficiencyOnProperMaterial; private final float efficiencyOnProperMaterial;
private final float damageVsEntity; private final float damageVsEntity;
private final int enchantability; private final int enchantability;
private ToolMaterial(int harvestLevel, int maxUses, float efficiency, float damageVsEntity, private ToolMaterial(int harvestLevel, int maxUses, float efficiency, float damageVsEntity,
int enchantability) { int enchantability) {
this.harvestLevel = harvestLevel; this.harvestLevel = harvestLevel;

3
src/game/java/net/minecraft/item/ItemPotion.java
View File

@ -74,9 +74,8 @@ 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);
} }
/** /**
* + allows items to add custom lines of information to the mouseover * + allows items to add custom lines of information to the mouseover
* description * description

3
src/game/java/net/minecraft/item/ItemStack.java
View File

@ -691,9 +691,6 @@ 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);