Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-28 19:39:14 +00:00
Code Issues Releases Activity

Bump version number

Browse Source
This commit is contained in:
HeroBrineGoat
2022-01-29 16:42:18 -05:00
parent 3d8b582a8f
commit 3d9c006310
6 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/io/github/fisher2911/hmccosmetics/config/CosmeticSettings.java
View File

@@ -12,13 +12,16 @@ public class CosmeticSettings {
private static final transient String COSMETIC_SETTINGS_PATH = "cosmetic-settings";
private static final transient String REQUIRE_EMPTY_HELMET_PATH = "require-empty-helmet";
private static final transient String REQUIRE_EMPTY_OFF_HAND_PATH = "require-empty-off-hand";
private static final transient String LOOK_DOWN_PITCH_PATH = "look-down-backpack-remove";
private boolean requireEmptyHelmet;
private boolean requireEmptyOffHand;
private int lookDownPitch;
public void load(final FileConfiguration config) {
this.requireEmptyHelmet = config.getBoolean(COSMETIC_SETTINGS_PATH + "." + REQUIRE_EMPTY_HELMET_PATH);
this.requireEmptyOffHand = config.getBoolean(COSMETIC_SETTINGS_PATH + "." + REQUIRE_EMPTY_OFF_HAND_PATH);
this.lookDownPitch = config.getInt(COSMETIC_SETTINGS_PATH + "." + LOOK_DOWN_PITCH_PATH);
}
public boolean isRequireEmptyHelmet() {
@@ -29,6 +32,10 @@ public class CosmeticSettings {
return requireEmptyOffHand;
}
public int getLookDownPitch() {
return lookDownPitch;
}
public void setRequireEmptyHelmet(final boolean requireEmptyHelmet) {
this.requireEmptyHelmet = requireEmptyHelmet;
}

27
src/main/java/io/github/fisher2911/hmccosmetics/user/User.java
View File

@@ -6,12 +6,13 @@ import com.comphenix.protocol.wrappers.EnumWrappers;
import com.comphenix.protocol.wrappers.Pair;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
import io.github.fisher2911.hmccosmetics.HMCCosmetics;
import io.github.fisher2911.hmccosmetics.config.Settings;
import io.github.fisher2911.hmccosmetics.gui.ArmorItem;
import io.github.fisher2911.hmccosmetics.inventory.PlayerArmor;
import io.github.fisher2911.hmccosmetics.packet.PacketManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -86,9 +87,9 @@ public class User {
PacketManager.sendPacket(other, packet);
}
public void spawnArmorStand() {
public void spawnArmorStand(final Settings settings) {
if (this.hasArmorStand) {
this.updateArmorStand();
this.updateArmorStand(settings);
return;
}
@@ -99,10 +100,9 @@ public class User {
this.hasArmorStand = true;
}
public void updateArmorStand() {
public void updateArmorStand(final Settings settings) {
if (!this.hasArmorStand) {
this.spawnArmorStand();
// return;
this.spawnArmorStand(settings);
}
final Player player = this.getPlayer();
@@ -133,6 +133,21 @@ public class User {
metaContainer.getWatchableCollectionModifier().write(0, metaData.getWatchableObjects());
PacketManager.sendPacketToOnline(armorPacket, metaContainer, rotationPacket, ridingPacket);
final int lookDownPitch = settings.getCosmeticSettings().getLookDownPitch();
if (lookDownPitch != -1 &&
this.isFacingDown(location, lookDownPitch)) {
equipmentList.set(0, new Pair<>(EnumWrappers.ItemSlot.HEAD,
new ItemStack(Material.AIR)
));
PacketManager.sendPacket(player, PacketManager.getEquipmentPacket(equipmentList, this.armorStandId));
}
}
private boolean isFacingDown(final Location location, final int pitchLimit) {
return location.getPitch() > pitchLimit;
}
public void despawnAttached() {

2
src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java
View File

@@ -88,7 +88,7 @@ public class UserManager {
this.plugin,
() -> {
for (final User user : this.userMap.values()) {
user.updateArmorStand();
user.updateArmorStand(this.plugin.getSettings());
}
},
1,