From 8f28b8fe4530c6f5fbcbe4bff4c7b7c002bbf5bc Mon Sep 17 00:00:00 2001
From: kirillsaint <kirillsaint@wtfuck.tk>
Date: Fri, 10 May 2024 00:12:48 +0600
Subject: [PATCH] (improve) 3d skins settings

---
 .../mixins/skins/PlayerRendererMixin.java     | 12 +++++-----
 .../client/mods/render/skins/SkinsMod.java    | 24 ++++++++-----------
 .../BodyLayerFeatureRenderer.java             | 10 ++++----
 .../HeadLayerFeatureRenderer.java             |  2 +-
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/main/java/net/silentclient/client/mixin/mixins/skins/PlayerRendererMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/skins/PlayerRendererMixin.java
index 00315b4..380a3b4 100644
--- a/src/main/java/net/silentclient/client/mixin/mixins/skins/PlayerRendererMixin.java
+++ b/src/main/java/net/silentclient/client/mixin/mixins/skins/PlayerRendererMixin.java
@@ -55,12 +55,12 @@ public abstract class PlayerRendererMixin extends RendererLivingEntity<AbstractC
             return;
         }
         if(Minecraft.getMinecraft().thePlayer.getPositionVector().squareDistanceTo(abstractClientPlayer.getPositionVector()) < Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Level Of Detail Distance").getValInt()*Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Level Of Detail Distance").getValInt()) {
-            playerModel.bipedHeadwear.isHidden = playerModel.bipedHeadwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Hat").getValBoolean();
-            playerModel.bipedBodyWear.isHidden = playerModel.bipedBodyWear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Jacket").getValBoolean();
-            playerModel.bipedLeftArmwear.isHidden = playerModel.bipedLeftArmwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Left Sleeve").getValBoolean();
-            playerModel.bipedRightArmwear.isHidden = playerModel.bipedRightArmwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Right Sleeve").getValBoolean();
-            playerModel.bipedLeftLegwear.isHidden = playerModel.bipedLeftLegwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Left Pants").getValBoolean();
-            playerModel.bipedRightLegwear.isHidden = playerModel.bipedRightLegwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Right Pants").getValBoolean();
+            playerModel.bipedHeadwear.isHidden = playerModel.bipedHeadwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Head").getValBoolean();
+            playerModel.bipedBodyWear.isHidden = playerModel.bipedBodyWear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Body").getValBoolean();
+            playerModel.bipedLeftArmwear.isHidden = playerModel.bipedLeftArmwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Left Arm").getValBoolean();
+            playerModel.bipedRightArmwear.isHidden = playerModel.bipedRightArmwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Right Arm").getValBoolean();
+            playerModel.bipedLeftLegwear.isHidden = playerModel.bipedLeftLegwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Left Leg").getValBoolean();
+            playerModel.bipedRightLegwear.isHidden = playerModel.bipedRightLegwear.isHidden || Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Right Leg").getValBoolean();
         } else {
             // not correct, but the correct way doesn't work cause 1.8 or whatever
             if(!abstractClientPlayer.isSpectator()) {
diff --git a/src/main/java/net/silentclient/client/mods/render/skins/SkinsMod.java b/src/main/java/net/silentclient/client/mods/render/skins/SkinsMod.java
index f84f024..cba6403 100644
--- a/src/main/java/net/silentclient/client/mods/render/skins/SkinsMod.java
+++ b/src/main/java/net/silentclient/client/mods/render/skins/SkinsMod.java
@@ -12,23 +12,19 @@ public class SkinsMod extends Mod {
 	public void setup() {
 		super.setup();
 		setNewMod(true);
-		this.addBooleanSetting("3D Hat", this, true);
-		this.addBooleanSetting("3D Jacket", this, true);
-		this.addBooleanSetting("3D Left Sleeve", this, true);
-		this.addBooleanSetting("3D Right Sleeve", this, true);
-		this.addBooleanSetting("3D Left Pants", this, true);
-		this.addBooleanSetting("3D Right Pants", this, true);
+
+		this.addBooleanSetting("Fast Render", this, true);
+		this.addSliderSetting("Level Of Detail Distance", this, 14, 5, 40, true);
+
+		this.addBooleanSetting("Head", this, true);
+		this.addBooleanSetting("Body", this, true);
+		this.addBooleanSetting("Left Arm", this, true);
+		this.addBooleanSetting("Right Arm", this, true);
+		this.addBooleanSetting("Left Leg", this, true);
+		this.addBooleanSetting("Right Leg", this, true);
 
 		this.addSliderSetting("Voxel Size", this, 1.15F, 1F, 1.4F, false);
 		this.addSliderSetting("Head Voxel Size", this, 1.18F, 1F, 1.25F, false);
 		this.addSliderSetting("Body Voxel Width Size", this, 1.05F, 1F, 1.4F, false);
-
-		this.addBooleanSetting("3D Skulls", this, true);
-		this.addBooleanSetting("3D Skull Items", this, true);
-		this.addSliderSetting("Skull Voxel Size", this, 1.1F, 1F, 1.2F, false);
-
-		this.addSliderSetting("Level Of Detail Distance", this, 14, 5, 40, true);
-
-		this.addBooleanSetting("Fast Render", this, true);
 	}
 }
diff --git a/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/BodyLayerFeatureRenderer.java b/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/BodyLayerFeatureRenderer.java
index 11b7537..325910c 100644
--- a/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/BodyLayerFeatureRenderer.java
+++ b/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/BodyLayerFeatureRenderer.java
@@ -29,11 +29,11 @@ public class BodyLayerFeatureRenderer
             RenderPlayer playerRenderer) {
         this.playerRenderer = playerRenderer;
         thinArms = ((PlayerEntityModelAccessor)playerRenderer).client$hasThinArms();
-        bodyLayers.add(new Layer(0, false, EnumPlayerModelParts.LEFT_PANTS_LEG, Shape.LEGS, () -> playerRenderer.getMainModel().bipedLeftLeg, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Left Pants").getValBoolean()));
-        bodyLayers.add(new Layer(1, false, EnumPlayerModelParts.RIGHT_PANTS_LEG, Shape.LEGS, () -> playerRenderer.getMainModel().bipedRightLeg, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Right Pants").getValBoolean()));
-        bodyLayers.add(new Layer(2, false, EnumPlayerModelParts.LEFT_SLEEVE, thinArms ? Shape.ARMS_SLIM : Shape.ARMS, () -> playerRenderer.getMainModel().bipedLeftArm, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Left Sleeve").getValBoolean()));
-        bodyLayers.add(new Layer(3, true, EnumPlayerModelParts.RIGHT_SLEEVE, thinArms ? Shape.ARMS_SLIM : Shape.ARMS, () -> playerRenderer.getMainModel().bipedRightArm, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Right Sleeve").getValBoolean()));
-        bodyLayers.add(new Layer(4, false, EnumPlayerModelParts.JACKET, Shape.BODY, () -> playerRenderer.getMainModel().bipedBody, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Jacket").getValBoolean()));
+        bodyLayers.add(new Layer(0, false, EnumPlayerModelParts.LEFT_PANTS_LEG, Shape.LEGS, () -> playerRenderer.getMainModel().bipedLeftLeg, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Left Leg").getValBoolean()));
+        bodyLayers.add(new Layer(1, false, EnumPlayerModelParts.RIGHT_PANTS_LEG, Shape.LEGS, () -> playerRenderer.getMainModel().bipedRightLeg, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Right Leg").getValBoolean()));
+        bodyLayers.add(new Layer(2, false, EnumPlayerModelParts.LEFT_SLEEVE, thinArms ? Shape.ARMS_SLIM : Shape.ARMS, () -> playerRenderer.getMainModel().bipedLeftArm, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Left Arm").getValBoolean()));
+        bodyLayers.add(new Layer(3, true, EnumPlayerModelParts.RIGHT_SLEEVE, thinArms ? Shape.ARMS_SLIM : Shape.ARMS, () -> playerRenderer.getMainModel().bipedRightArm, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Right Arm").getValBoolean()));
+        bodyLayers.add(new Layer(4, false, EnumPlayerModelParts.JACKET, Shape.BODY, () -> playerRenderer.getMainModel().bipedBody, () -> Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Body").getValBoolean()));
     }
 
     @Override
diff --git a/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/HeadLayerFeatureRenderer.java b/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/HeadLayerFeatureRenderer.java
index cb0782f..74d831f 100644
--- a/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/HeadLayerFeatureRenderer.java
+++ b/src/main/java/net/silentclient/client/mods/render/skins/renderlayers/HeadLayerFeatureRenderer.java
@@ -32,7 +32,7 @@ public class HeadLayerFeatureRenderer implements LayerRenderer<AbstractClientPla
     @Override
     public void doRenderLayer(AbstractClientPlayer player, float paramFloat1, float paramFloat2, float paramFloat3,
                               float deltaTick, float paramFloat5, float paramFloat6, float paramFloat7) {
-        if (!player.hasSkin() || player.isInvisible() || !Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "3D Hat").getValBoolean()) {
+        if (!player.hasSkin() || player.isInvisible() || !Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Head").getValBoolean()) {
             return;
         }
         if(mc.thePlayer.getPositionVector().squareDistanceTo(player.getPositionVector()) > Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Level Of Detail Distance").getValInt()*Client.getInstance().getSettingsManager().getSettingByClass(SkinsMod.class, "Level Of Detail Distance").getValInt())return;