9
0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-20 23:49:18 +00:00

Redo getItem method

This commit is contained in:
LoJoSho
2022-12-30 19:35:33 -06:00
parent c7f05c7b9a
commit c2039b1e6a
5 changed files with 25 additions and 30 deletions

View File

@@ -2,6 +2,8 @@ package com.hibiscusmc.hmccosmetics.cosmetic;
import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.ConfigurationNode;
public class Cosmetic { public class Cosmetic {
@@ -9,7 +11,6 @@ public class Cosmetic {
private String id; private String id;
private String permission; private String permission;
private CosmeticSlot slot; private CosmeticSlot slot;
private boolean equipable; // This simply means if a player can put it on their body.
private boolean dyable; private boolean dyable;
protected Cosmetic(String id, ConfigurationNode config) { protected Cosmetic(String id, ConfigurationNode config) {
@@ -18,7 +19,6 @@ public class Cosmetic {
MessagesUtil.sendDebugMessages("Slot: " + config.node("slot").getString()); MessagesUtil.sendDebugMessages("Slot: " + config.node("slot").getString());
setSlot(CosmeticSlot.valueOf(config.node("slot").getString())); setSlot(CosmeticSlot.valueOf(config.node("slot").getString()));
setEquipable(false);
setDyable(config.node("dyeable").getBoolean(false)); setDyable(config.node("dyeable").getBoolean(false));
MessagesUtil.sendDebugMessages("Dyeable " + dyable); MessagesUtil.sendDebugMessages("Dyeable " + dyable);
@@ -53,14 +53,6 @@ public class Cosmetic {
this.id = id; this.id = id;
} }
public void setEquipable(boolean equipable) {
this.equipable = equipable;
}
public boolean isEquipable() {
return equipable;
}
public void setDyable(boolean dyable) { public void setDyable(boolean dyable) {
this.dyable = dyable; this.dyable = dyable;
} }
@@ -73,4 +65,9 @@ public class Cosmetic {
public void update(CosmeticUser user) { public void update(CosmeticUser user) {
// Override // Override
} }
@Nullable
public ItemStack getItem() {
return null; // Override
}
} }

View File

@@ -27,8 +27,6 @@ public class CosmeticArmorType extends Cosmetic {
this.itemStack = generateItemStack(config.node("item")); this.itemStack = generateItemStack(config.node("item"));
this.equipSlot = InventoryUtils.getEquipmentSlot(getSlot()); this.equipSlot = InventoryUtils.getEquipmentSlot(getSlot());
setEquipable(true);
} }
@Override @Override
@@ -37,7 +35,8 @@ public class CosmeticArmorType extends Cosmetic {
PacketManager.equipmentSlotUpdate(player, getSlot(), PlayerUtils.getNearbyPlayers(player)); PacketManager.equipmentSlotUpdate(player, getSlot(), PlayerUtils.getNearbyPlayers(player));
} }
public ItemStack getCosmeticItem() { @Override
public ItemStack getItem() {
return this.itemStack.clone(); return this.itemStack.clone();
} }

View File

@@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@@ -56,7 +57,16 @@ public class CosmeticBackpackType extends Cosmetic {
} }
public ItemStack getBackpackItem() { public void rotateEntity(int entityId, Location location) {
//PacketManager.sendRotationPacket(entityId, location, true);
}
public void moveEntity(int entityId, Location location) {
//PacketManager.sendTeleportPacket();
}
@Override
public ItemStack getItem() {
if (this.backpackItem == null ) { if (this.backpackItem == null ) {
MessagesUtil.sendDebugMessages("Backpack item was null for " + getId()); MessagesUtil.sendDebugMessages("Backpack item was null for " + getId());
this.backpackItem = generateItemStack(config.node("item")); this.backpackItem = generateItemStack(config.node("item"));

View File

@@ -23,7 +23,6 @@ public class CosmeticMainhandType extends Cosmetic {
this.itemStack = generateItemStack(config.node("item")); this.itemStack = generateItemStack(config.node("item"));
setEquipable(true);
} }
@Override @Override
@@ -48,7 +47,8 @@ public class CosmeticMainhandType extends Cosmetic {
} }
} }
public ItemStack getItemStack() { @Override
return itemStack; public ItemStack getItem() {
return itemStack.clone();
} }
} }

View File

@@ -149,19 +149,8 @@ public class CosmeticUser {
if (hideCosmetics) { if (hideCosmetics) {
return getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmetic.getSlot())); return getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmetic.getSlot()));
} }
if (cosmetic instanceof CosmeticArmorType) { if (cosmetic instanceof CosmeticArmorType || cosmetic instanceof CosmeticMainhandType || cosmetic instanceof CosmeticBackpackType) {
CosmeticArmorType cosmetic1 = (CosmeticArmorType) cosmetic; item = cosmetic.getItem();
item = cosmetic1.getCosmeticItem();
MessagesUtil.sendDebugMessages("GetUserCosemticUser Armor");
}
if (cosmetic instanceof CosmeticMainhandType) {
CosmeticMainhandType cosmetic1 = (CosmeticMainhandType) cosmetic;
item = cosmetic1.getItemStack();
}
if (cosmetic instanceof CosmeticBackpackType) {
CosmeticBackpackType cosmetic1 = (CosmeticBackpackType) cosmetic;
item = cosmetic1.getBackpackItem();
MessagesUtil.sendDebugMessages("GetUserCosemticUser Backpack");
} }
if (cosmetic instanceof CosmeticBalloonType) { if (cosmetic instanceof CosmeticBalloonType) {
item = new ItemStack(Material.LEATHER_HORSE_ARMOR); item = new ItemStack(Material.LEATHER_HORSE_ARMOR);