asaasdasd

.gitignore

@@ -234,4 +234,7 @@ gradle-app.setting
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
 
-# End of https://www.gitignore.io/api/java,code-java,intellij,eclipse,netbeans,gradle,git,maven,windows,linux,macos
\ No newline at end of file
+# End of https://www.gitignore.io/api/java,code-java,intellij,eclipse,netbeans,gradle,git,maven,windows,linux,macos
+
+# Custom defined
+/server

api/src/main/java/io/lumine/cosmetics/api/cosmetics/Cosmetic.java

@@ -39,12 +39,9 @@ public abstract class Cosmetic implements PropertyHolder,MenuData<CosmeticProfil
     }
     
     public boolean isEquipped(CosmeticInventory inventory) {
-        var maybeCosmetic = inventory.getCustomEquipped(type);
-        
-        if(maybeCosmetic.isEmpty()) {
-            return false;
-        }
-        return maybeCosmetic.get().equals(this);
+        var maybeCosmetic = inventory.getEquipped(getClass());
+
+        return maybeCosmetic.isPresent() && maybeCosmetic.get().equals(this);
     }
     
 }

api/src/main/java/io/lumine/cosmetics/api/players/CosmeticInventory.java

@@ -10,12 +10,8 @@ public interface CosmeticInventory {
     void initialize(CosmeticProfile profile);
     
     Collection<String> getUnlocked(String type);
-    
-    Optional<Cosmetic> getCustomEquipped(String type);
-
-    Optional<Cosmetic> getEquippedHat();
 
-    Optional<Cosmetic> getEquippedBack();
+    Optional<Cosmetic> getEquipped(Class<? extends Cosmetic> tClass);
     
     void equip(Cosmetic cosmetic);
 }

dist/pom.xml

@@ -78,7 +78,7 @@
                 <version>3.1.0</version>
                 <configuration>
                     <finalName>MCCosmetics-${project.parent.version}</finalName>
-                    <outputDirectory>../target</outputDirectory>
+                    <outputDirectory>../server/plugins</outputDirectory>
                 </configuration>
             </plugin>
 

plugin/src/main/java/io/lumine/cosmetics/MCCosmeticsPlugin.java

@@ -82,6 +82,7 @@ public class MCCosmeticsPlugin extends LuminePlugin {
         cosmetics = new CosmeticsExecutor(this);
         
         hatManager = new HatManager(this);
+        backManager = new BackManager(this);
         
         profiles = new ProfileManager(this);
         

plugin/src/main/java/io/lumine/cosmetics/constants/CosmeticType.java

@@ -15,7 +15,7 @@ public class CosmeticType {
     private static final Map<Class<? extends Cosmetic>, CosmeticConstant> constants = new HashMap<>();
 
     static {
-        register(BackAccessory.class, new CosmeticConstant("BACK", "backs"));
+        register(BackAccessory.class, new CosmeticConstant("BACK_ACCESSORY", "backs"));
         register(Hat.class, new CosmeticConstant("HAT", "hats"));
         register(MEGAccessory.class, new CosmeticConstant("MEG", "modelengine"));
         register(ParticleAccessory.class, new CosmeticConstant("PARTICLE", "particle"));

plugin/src/main/java/io/lumine/cosmetics/managers/back/BackManager.java

@@ -32,6 +32,6 @@ public class BackManager extends MCCosmeticsManager<BackAccessory> {
 
     @Override
     public void equip(CosmeticProfile profile) {
-        plugin.getVolatileCodeHandler().getBackHelper().applyBackPacket(profile);
+        getPlugin().getVolatileCodeHandler().getBackHelper().applyBackPacket(profile);
     }
 }

plugin/src/main/java/io/lumine/cosmetics/managers/particle/ParticleManager.java

@@ -8,8 +8,8 @@ import java.io.File;
 
 public class ParticleManager extends MCCosmeticsManager<ParticleAccessory> {
 
-	public ParticleManager(MCCosmeticsPlugin plugin, Class<ParticleAccessory> megAccessoryClass) {
-		super(plugin, megAccessoryClass);
+	public ParticleManager(MCCosmeticsPlugin plugin, Class<ParticleAccessory> particleAccessoryClass) {
+		super(plugin, particleAccessoryClass);
 	}
 
 	@Override

plugin/src/main/java/io/lumine/cosmetics/players/ProfileInventory.java

@@ -19,11 +19,8 @@ import java.util.Optional;
 public class ProfileInventory implements CosmeticInventory {
 
     @Getter private transient CosmeticProfile profile;
-    
-    private transient Optl<Hat> equippedHat;
-    private transient Optl<BackAccessory> equippedBack;
-    private transient final Map<String,Cosmetic> equippedCustom = Maps.newConcurrentMap();
-    
+
+    private transient final Map<Class<? extends Cosmetic>, Cosmetic> equipped = Maps.newConcurrentMap();
     @Getter private Map<String,List<String>> unlockedCosmetics = Maps.newConcurrentMap();
     @Getter private Map<String,String> equippedCosmetics = Maps.newConcurrentMap();
     
@@ -49,12 +46,7 @@ public class ProfileInventory implements CosmeticInventory {
 
     public void equip(Cosmetic cosmetic) {
         equippedCosmetics.put(cosmetic.getType(), cosmetic.getKey());
-        
-        if(cosmetic instanceof Hat hat) {
-            equippedHat = Optl.of(hat);
-        } else {
-            
-        }
+        equipped.put(cosmetic.getClass(), cosmetic);
         cosmetic.getManager().equip(profile);
     }
 
@@ -63,23 +55,13 @@ public class ProfileInventory implements CosmeticInventory {
     }
 
     @Override
-    public Optional<Cosmetic> getCustomEquipped(String type) {
-        return Optional.ofNullable(equippedCustom.getOrDefault(type, null));
-    }
-
-    @Override
-    public Optional<Cosmetic> getEquippedHat() {
-        return Optional.ofNullable(equippedHat.orElseGet(null));
+    public Collection<String> getUnlocked(String type) {
+        return unlockedCosmetics.getOrDefault(type, Lists.newArrayList());
     }
 
     @Override
-    public Optional<Cosmetic> getEquippedBack() {
-        return Optional.ofNullable(equippedBack.orElseGet(null));
+    public Optional<Cosmetic> getEquipped(Class<? extends Cosmetic> tClass) {
+        return Optional.ofNullable(equipped.get(tClass));
     }
 
-    @Override
-    public Collection<String> getUnlocked(String type) {
-        return unlockedCosmetics.getOrDefault(type, Lists.newArrayList());
-    }
-    
 }

v1_18/src/main/java/io/lumine/cosmetics/nms/v1_18_R1/cosmetic/VolatileHatImpl.java

@@ -42,7 +42,7 @@ public class VolatileHatImpl implements VolatileHatHelper {
             if (profile == null)
                 return;
             Player player = profile.getPlayer();
-            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquippedHat();
+            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquipped(Hat.class);
 
             if (cosmetic.isEmpty() || !(cosmetic.get() instanceof ItemCosmetic hat))
                 return;

v1_18_R2/pom.xml

@@ -126,7 +126,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.25.Final</version>
+            <version>4.1.68.Final</version>
             <scope>provided</scope>
         </dependency>
         

v1_18_R2/src/main/java/io/lumine/cosmetics/nms/v1_18_R2/cosmetic/VolatileBackImpl.java

@@ -5,6 +5,7 @@ import io.lumine.cosmetics.MCCosmeticsPlugin;
 import io.lumine.cosmetics.api.cosmetics.Cosmetic;
 import io.lumine.cosmetics.api.cosmetics.ItemCosmetic;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
+import io.lumine.cosmetics.managers.back.BackAccessory;
 import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_18_R2;
 import io.lumine.cosmetics.nms.cosmetic.VolatileBackHelper;
 import io.netty.buffer.Unpooled;
@@ -43,7 +44,7 @@ public class VolatileBackImpl implements VolatileBackHelper {
 		if (profile == null)
 			return;
 		Player player = profile.getPlayer();
-		Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquippedBack();
+		Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquipped(BackAccessory.class);
 
 		if (cosmetic.isEmpty() || !(cosmetic.get() instanceof ItemCosmetic back))
 			return;

v1_18_R2/src/main/java/io/lumine/cosmetics/nms/v1_18_R2/cosmetic/VolatileHatImpl.java

@@ -5,6 +5,7 @@ import io.lumine.cosmetics.MCCosmeticsPlugin;
 import io.lumine.cosmetics.api.cosmetics.Cosmetic;
 import io.lumine.cosmetics.api.cosmetics.ItemCosmetic;
 import io.lumine.cosmetics.api.players.CosmeticProfile;
+import io.lumine.cosmetics.managers.hats.Hat;
 import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_18_R2;
 import io.lumine.cosmetics.nms.cosmetic.VolatileHatHelper;
 import io.lumine.cosmetics.players.Profile;
@@ -38,7 +39,7 @@ public class VolatileHatImpl implements VolatileHatHelper {
             if (profile == null)
                 return;
             Player player = profile.getPlayer();
-            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquippedHat();
+            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquipped(Hat.class);
 
             if (cosmetic.isEmpty() || !(cosmetic.get() instanceof ItemCosmetic hat))
                 return;
@@ -67,7 +68,7 @@ public class VolatileHatImpl implements VolatileHatHelper {
             if(profile == null)
                 return null;
 
-            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquippedHat();
+            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquipped(Hat.class);
 
             if (cosmetic.isEmpty() || !(cosmetic.get() instanceof ItemCosmetic hat))
                 return null;
@@ -94,7 +95,7 @@ public class VolatileHatImpl implements VolatileHatHelper {
             if (profile == null)
                 return equipmentPacket;
 
-            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquippedHat();
+            Optional<Cosmetic> cosmetic = profile.getCosmeticInventory().getEquipped(Hat.class);
 
             if (cosmetic.isEmpty() || !(cosmetic.get() instanceof ItemCosmetic hat))
                 return equipmentPacket;

v1_18_R2/src/main/java/io/lumine/cosmetics/nms/v1_18_R2/network/VolatileChannelHandler.java

@@ -3,6 +3,7 @@ package io.lumine.cosmetics.nms.v1_18_R2.network;
 import io.lumine.cosmetics.MCCosmeticsPlugin;
 import io.lumine.cosmetics.api.cosmetics.Cosmetic;
 import io.lumine.cosmetics.api.cosmetics.ItemCosmetic;
+import io.lumine.cosmetics.managers.back.BackAccessory;
 import io.lumine.cosmetics.nms.VolatileCodeEnabled_v1_18_R2;
 import io.lumine.cosmetics.players.Profile;
 import io.netty.channel.ChannelDuplexHandler;
@@ -55,7 +56,7 @@ public class VolatileChannelHandler extends ChannelDuplexHandler {
 
 	private void handleSpawn(Profile profile) {
 
-		Optional<Cosmetic> maybeBack = profile.getCosmeticInventory().getEquippedBack();
+		Optional<Cosmetic> maybeBack = profile.getCosmeticInventory().getEquipped(BackAccessory.class);
 		if (maybeBack.isPresent() && maybeBack.get() instanceof ItemCosmetic) {
 			nmsHandler.getBackHelper().respawnForPlayer(profile.getPlayer(), player);
 		}
@@ -64,7 +65,7 @@ public class VolatileChannelHandler extends ChannelDuplexHandler {
 
 	private void handleDespawn(Profile profile) {
 
-		Optional<Cosmetic> maybeBack = profile.getCosmeticInventory().getEquippedBack();
+		Optional<Cosmetic> maybeBack = profile.getCosmeticInventory().getEquipped(BackAccessory.class);
 		if (maybeBack.isPresent() && maybeBack.get() instanceof ItemCosmetic) {
 			nmsHandler.getBackHelper().despawnForPlayer(profile.getPlayer(), player);
 		}