From abb319c7a03a2dba5cfcb48bf64c84a910146a5d Mon Sep 17 00:00:00 2001 From: tr7zw Date: Sat, 16 Mar 2024 17:24:15 +0100 Subject: [PATCH] Format --- .../config/FirstPersonSettings.java | 1 - .../versionless/config/VanillaHands.java | 2 +- .../dev/tr7zw/firstperson/LogicHandler.java | 6 ++-- .../mixins/ArmorFeatureRendererMixin.java | 2 +- .../mixins/HeldItemFeatureRendererMixin.java | 3 +- .../mixins/HeldItemRendererMixin.java | 2 +- .../mixins/LivingEntityRendererMixin.java | 35 +++++++++++-------- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/FirstPersonSettings.java b/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/FirstPersonSettings.java index fbaee077..742a5a8a 100644 --- a/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/FirstPersonSettings.java +++ b/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/FirstPersonSettings.java @@ -17,7 +17,6 @@ public class FirstPersonSettings { public VanillaHands vanillaHandsMode = VanillaHands.OFF; public boolean dynamicMode = true; - public Set autoVanillaHands = new HashSet<>(Arrays.asList("antiqueatlas:antique_atlas", "twilightforest:filled_magic_map", "twilightforest:filled_maze_map", "twilightforest:filled_ore_map", "create:potato_cannon", "create:extendo_grip", "create:handheld_worldshaper", "map_atlases:atlas")); diff --git a/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/VanillaHands.java b/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/VanillaHands.java index a679c7ab..f431bfe4 100644 --- a/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/VanillaHands.java +++ b/FPVersionless/src/main/java/dev/tr7zw/firstperson/versionless/config/VanillaHands.java @@ -1,5 +1,5 @@ package dev.tr7zw.firstperson.versionless.config; public enum VanillaHands { -OFF, ALL, ALL_DOUBLE, ITEMS; + OFF, ALL, ALL_DOUBLE, ITEMS; } diff --git a/src/main/java/dev/tr7zw/firstperson/LogicHandler.java b/src/main/java/dev/tr7zw/firstperson/LogicHandler.java index d6e052ab..03ce6c9f 100644 --- a/src/main/java/dev/tr7zw/firstperson/LogicHandler.java +++ b/src/main/java/dev/tr7zw/firstperson/LogicHandler.java @@ -209,7 +209,7 @@ public boolean hideArmsAndItems(LivingEntity livingEntity) { * @return */ public boolean hideArmsAndItems(ItemStack mainhand, ItemStack offhand) { - if(lookingDown()) { + if (lookingDown()) { return false; } return fpm.getConfig().vanillaHandsMode != VanillaHands.OFF || autoVanillaHandItems.contains(mainhand.getItem()) @@ -220,7 +220,7 @@ public boolean hideArmsAndItems(ItemStack mainhand, ItemStack offhand) { public boolean dynamicHandsEnabled() { return dynamicHandsEnabled(client.player); } - + public boolean dynamicHandsEnabled(LivingEntity livingEntity) { if (livingEntity instanceof PlayerAccess playerAccess) { return dynamicHandsEnabled(playerAccess.getInventory().getSelected(), @@ -228,7 +228,7 @@ public boolean dynamicHandsEnabled(LivingEntity livingEntity) { } return false; } - + /** * True is dynamic hands is enabled and could apply at this moment * diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/ArmorFeatureRendererMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/ArmorFeatureRendererMixin.java index 04031783..d5fac7f0 100644 --- a/src/main/java/dev/tr7zw/firstperson/mixins/ArmorFeatureRendererMixin.java +++ b/src/main/java/dev/tr7zw/firstperson/mixins/ArmorFeatureRendererMixin.java @@ -48,7 +48,7 @@ private void renderArmor(PoseStack matrices, MultiBufferSource vertexConsumers, if (FirstPersonModelCore.instance.getLogicHandler().hideArmsAndItems()) { ((ModelPartBase) (Object) bipedEntityModel.leftArm).setHidden(); ((ModelPartBase) (Object) bipedEntityModel.rightArm).setHidden(); - } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {//TODO DYNAMIC HAND + } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {// TODO DYNAMIC HAND if (!livingEntity.getOffhandItem().isEmpty()) ((ModelPartBase) (Object) bipedEntityModel.leftArm).setHidden(); if (!livingEntity.getMainHandItem().isEmpty()) diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java index 7f2480a3..ed03c2e8 100644 --- a/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java +++ b/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemFeatureRendererMixin.java @@ -40,7 +40,8 @@ private void renderArmWithItem(LivingEntity livingEntity, ItemStack itemStack, I //#endif //spotless:on if (livingEntity instanceof LocalPlayer && FirstPersonModelCore.instance.isRenderingPlayer()) { - if (FirstPersonModelCore.instance.getLogicHandler().hideArmsAndItems(livingEntity) && !FirstPersonModelCore.instance.getLogicHandler().lookingDown()) { + if (FirstPersonModelCore.instance.getLogicHandler().hideArmsAndItems(livingEntity) + && !FirstPersonModelCore.instance.getLogicHandler().lookingDown()) { ci.cancel(); } } diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemRendererMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemRendererMixin.java index 67d15bbe..4d196ce3 100644 --- a/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemRendererMixin.java +++ b/src/main/java/dev/tr7zw/firstperson/mixins/HeldItemRendererMixin.java @@ -89,7 +89,7 @@ public abstract void renderPlayerArm(PoseStack matrices, MultiBufferSource verte */ @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;getAttackStrengthScale(F)F", shift = At.Shift.BEFORE), method = "tick", cancellable = true) - public void tick(CallbackInfo ci) {//TODO DYNAMIC HAND + public void tick(CallbackInfo ci) {// TODO DYNAMIC HAND if (FirstPersonModelCore.instance.isEnabled() && FirstPersonModelCore.instance.getLogicHandler().showVanillaHands() && FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) { diff --git a/src/main/java/dev/tr7zw/firstperson/mixins/LivingEntityRendererMixin.java b/src/main/java/dev/tr7zw/firstperson/mixins/LivingEntityRendererMixin.java index cf816627..1899f890 100644 --- a/src/main/java/dev/tr7zw/firstperson/mixins/LivingEntityRendererMixin.java +++ b/src/main/java/dev/tr7zw/firstperson/mixins/LivingEntityRendererMixin.java @@ -1,7 +1,6 @@ package dev.tr7zw.firstperson.mixins; import net.minecraft.client.Minecraft; -import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; import net.minecraft.world.item.Items; import org.joml.Vector3f; @@ -57,13 +56,15 @@ public void renderPostAnim(LivingEntity livingEntity, float f, float g, PoseStac if (FirstPersonModelCore.instance.getLogicHandler().hideArmsAndItems(livingEntity)) { ((ModelPartBase) (Object) humanModel.leftArm).setHidden(); ((ModelPartBase) (Object) humanModel.rightArm).setHidden(); - } else if(FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {//TODO VANILLA HANDS ITEM + } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {// TODO VANILLA HANDS + // ITEM float offset = Mth.clamp(-Minecraft.getInstance().player.getXRot() / 20 + 2, -0.0f, 0.7f); humanModel.rightArm.offsetRotation(new Vector3f(offset, 0, 0)); humanModel.leftArm.offsetRotation(new Vector3f(offset, 0, 0)); - if (!FirstPersonModelCore.instance.getLogicHandler().lookingDown()) {//TODO DYNAMIC HAND - if (!playerAccess.getInventory().offhand.get(0).isEmpty() || livingEntity.getMainHandItem().getItem().equals(Items.FILLED_MAP)) { + if (!FirstPersonModelCore.instance.getLogicHandler().lookingDown()) {// TODO DYNAMIC HAND + if (!playerAccess.getInventory().offhand.get(0).isEmpty() + || livingEntity.getMainHandItem().getItem().equals(Items.FILLED_MAP)) { ((ModelPartBase) (Object) humanModel.leftArm).setHidden(); } if (!playerAccess.getInventory().getSelected().isEmpty()) { @@ -79,16 +80,18 @@ public void renderPostAnim(LivingEntity livingEntity, float f, float g, PoseStac headShouldBeHidden = true; ((ModelPartBase) (Object) playerModel.hat).setHidden(); if (livingEntity instanceof PlayerAccess playerAccess) { - if(FirstPersonModelCore.instance.getLogicHandler().hideArmsAndItems(livingEntity)) { + if (FirstPersonModelCore.instance.getLogicHandler().hideArmsAndItems(livingEntity)) { ((ModelPartBase) (Object) playerModel.leftSleeve).setHidden(); ((ModelPartBase) (Object) playerModel.rightSleeve).setHidden(); - } else if(FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {//TODO VANILLA HANDS ITEM - float offset = Mth.clamp(-Minecraft.getInstance().player.getXRot()/20+2,-0.0f,0.7f); - playerModel.rightSleeve.offsetRotation(new Vector3f(offset,0,0)); - playerModel.leftSleeve.offsetRotation(new Vector3f(offset,0,0)); + } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {// TODO VANILLA HANDS + // ITEM + float offset = Mth.clamp(-Minecraft.getInstance().player.getXRot() / 20 + 2, -0.0f, 0.7f); + playerModel.rightSleeve.offsetRotation(new Vector3f(offset, 0, 0)); + playerModel.leftSleeve.offsetRotation(new Vector3f(offset, 0, 0)); - if (!FirstPersonModelCore.instance.getLogicHandler().lookingDown()) {//TODO DYNAMIC HAND - if (!playerAccess.getInventory().offhand.get(0).isEmpty() || livingEntity.getMainHandItem().getItem().equals(Items.FILLED_MAP)) { + if (!FirstPersonModelCore.instance.getLogicHandler().lookingDown()) {// TODO DYNAMIC HAND + if (!playerAccess.getInventory().offhand.get(0).isEmpty() + || livingEntity.getMainHandItem().getItem().equals(Items.FILLED_MAP)) { ((ModelPartBase) (Object) playerModel.leftSleeve).setHidden(); } if (!playerAccess.getInventory().getSelected().isEmpty()) { @@ -125,12 +128,13 @@ public void renderReturn(LivingEntity livingEntity, float f, float g, PoseStack ((ModelPartBase) (Object) headed.getHead()).showAgain(); } if (model instanceof HumanoidModel humanModel) { - if(FirstPersonModelCore.instance.getLogicHandler().showVanillaHands() + if (FirstPersonModelCore.instance.getLogicHandler().showVanillaHands() && !FirstPersonModelCore.instance.getLogicHandler().showVanillaHands()) { ((ModelPartBase) (Object) humanModel.leftArm).showAgain(); ((ModelPartBase) (Object) humanModel.rightArm).showAgain(); - } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {//TODO VANILLA HANDS ITEM - if (!FirstPersonModelCore.instance.getLogicHandler().lookingDown()) {//TODO DYNAMIC HAND + } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {// TODO VANILLA HANDS + // ITEM + if (!FirstPersonModelCore.instance.getLogicHandler().lookingDown()) {// TODO DYNAMIC HAND ((ModelPartBase) (Object) humanModel.leftArm).showAgain(); ((ModelPartBase) (Object) humanModel.rightArm).showAgain(); } else { @@ -149,7 +153,8 @@ public void renderReturn(LivingEntity livingEntity, float f, float g, PoseStack if (FirstPersonModelCore.instance.getLogicHandler().showVanillaHands()) { ((ModelPartBase) (Object) playerModel.leftSleeve).showAgain(); ((ModelPartBase) (Object) playerModel.rightSleeve).showAgain(); - } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {//TODO VANILLA HANDS ITEM + } else if (FirstPersonModelCore.instance.getLogicHandler().dynamicHandsEnabled()) {// TODO VANILLA HANDS + // ITEM if (!livingEntity.getOffhandItem().isEmpty()) ((ModelPartBase) (Object) playerModel.leftSleeve).showAgain(); if (!livingEntity.getMainHandItem().isEmpty())