From d8751e939e6eb2427c548846f4f9af979dcfeaca Mon Sep 17 00:00:00 2001
From: ThisIsALegitUsername <andrewsouchien@gmail.com>
Date: Sat, 11 Feb 2023 19:52:33 +0000
Subject: [PATCH] Optimize cosmetics

---
 .../java/dev/resent/cosmetic/CosmeticBase.java    | 13 +++++++++++--
 .../dev/resent/cosmetic/CosmeticModelBase.java    | 15 ---------------
 .../dev/resent/cosmetic/impl/CrystalWings.java    |  1 -
 .../java/dev/resent/cosmetic/impl/Glasses.java    |  1 -
 src/main/java/dev/resent/cosmetic/impl/Halo.java  |  1 -
 .../java/dev/resent/cosmetic/impl/TopHat.java     |  1 -
 6 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 src/main/java/dev/resent/cosmetic/CosmeticModelBase.java

diff --git a/src/main/java/dev/resent/cosmetic/CosmeticBase.java b/src/main/java/dev/resent/cosmetic/CosmeticBase.java
index f0541bae..33e8dad7 100644
--- a/src/main/java/dev/resent/cosmetic/CosmeticBase.java
+++ b/src/main/java/dev/resent/cosmetic/CosmeticBase.java
@@ -1,6 +1,8 @@
 package dev.resent.cosmetic;
 
 import net.minecraft.client.entity.AbstractClientPlayer;
+import net.minecraft.client.model.ModelBase;
+import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.entity.RenderPlayer;
 import net.minecraft.client.renderer.entity.layers.LayerRenderer;
 
@@ -21,8 +23,15 @@ public abstract class CosmeticBase implements LayerRenderer<AbstractClientPlayer
     public abstract void render(AbstractClientPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale);
 
     @Override
-    public boolean shouldCombineTextures() {
-        return false;
+    public boolean shouldCombineTextures() { return false; }
+    public class CosmeticModelBase extends ModelBase{
+
+        protected final ModelBiped playerModel;
+    
+        public CosmeticModelBase(RenderPlayer player){
+            this.playerModel = player.getMainModel();
+        }
+        
     }
     
 }
diff --git a/src/main/java/dev/resent/cosmetic/CosmeticModelBase.java b/src/main/java/dev/resent/cosmetic/CosmeticModelBase.java
deleted file mode 100644
index cfa73518..00000000
--- a/src/main/java/dev/resent/cosmetic/CosmeticModelBase.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package dev.resent.cosmetic;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.renderer.entity.RenderPlayer;
-
-public class CosmeticModelBase extends ModelBase{
-
-    protected final ModelBiped playerModel;
-
-    public CosmeticModelBase(RenderPlayer player){
-        this.playerModel = player.getMainModel();
-    }
-    
-}
diff --git a/src/main/java/dev/resent/cosmetic/impl/CrystalWings.java b/src/main/java/dev/resent/cosmetic/impl/CrystalWings.java
index 33b5dbd1..1dc723af 100644
--- a/src/main/java/dev/resent/cosmetic/impl/CrystalWings.java
+++ b/src/main/java/dev/resent/cosmetic/impl/CrystalWings.java
@@ -2,7 +2,6 @@ package dev.resent.cosmetic.impl;
 
 import dev.resent.cosmetic.CosmeticBase;
 import dev.resent.cosmetic.CosmeticController;
-import dev.resent.cosmetic.CosmeticModelBase;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.AbstractClientPlayer;
diff --git a/src/main/java/dev/resent/cosmetic/impl/Glasses.java b/src/main/java/dev/resent/cosmetic/impl/Glasses.java
index f487d782..97a09405 100644
--- a/src/main/java/dev/resent/cosmetic/impl/Glasses.java
+++ b/src/main/java/dev/resent/cosmetic/impl/Glasses.java
@@ -2,7 +2,6 @@ package dev.resent.cosmetic.impl;
 
 import dev.resent.cosmetic.CosmeticBase;
 import dev.resent.cosmetic.CosmeticController;
-import dev.resent.cosmetic.CosmeticModelBase;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/dev/resent/cosmetic/impl/Halo.java b/src/main/java/dev/resent/cosmetic/impl/Halo.java
index c76756dc..5938a5fa 100644
--- a/src/main/java/dev/resent/cosmetic/impl/Halo.java
+++ b/src/main/java/dev/resent/cosmetic/impl/Halo.java
@@ -2,7 +2,6 @@ package dev.resent.cosmetic.impl;
 
 import dev.resent.cosmetic.CosmeticBase;
 import dev.resent.cosmetic.CosmeticController;
-import dev.resent.cosmetic.CosmeticModelBase;
 import dev.resent.util.render.Color;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/dev/resent/cosmetic/impl/TopHat.java b/src/main/java/dev/resent/cosmetic/impl/TopHat.java
index 1437c525..a75e2376 100644
--- a/src/main/java/dev/resent/cosmetic/impl/TopHat.java
+++ b/src/main/java/dev/resent/cosmetic/impl/TopHat.java
@@ -2,7 +2,6 @@ package dev.resent.cosmetic.impl;
 
 import dev.resent.cosmetic.CosmeticBase;
 import dev.resent.cosmetic.CosmeticController;
-import dev.resent.cosmetic.CosmeticModelBase;
 import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelRenderer;