From 31a3f8e5122b41a0ce567dd1e4837e95185892a2 Mon Sep 17 00:00:00 2001 From: Goodbird Date: Mon, 12 Feb 2024 20:09:15 +0300 Subject: [PATCH] Fixed the ability to remove the animations --- .../client/gui/SubGuiModelAnimation.java | 35 ++++++------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java b/src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java index 340a238..6e97b9e 100644 --- a/src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java +++ b/src/main/java/com/goodbird/npcgecko/client/gui/SubGuiModelAnimation.java @@ -92,35 +92,20 @@ public class SubGuiModelAnimation extends SubGuiInterface implements ITextfieldL else textfield.setText(getModelData(npc).getAnimFile()); } - if(textfield.id == 2 && isValidAnimation(textfield.getText())){ - if(!textfield.isEmpty()) - getModelData(npc).setIdleAnim(textfield.getText()); - else - textfield.setText(getModelData(npc).getIdleAnim()); + if(textfield.id == 2 && (isValidAnimation(textfield.getText()) || textfield.getText().isEmpty())){ + getModelData(npc).setIdleAnim(textfield.getText()); } - if(textfield.id == 3 && isValidAnimation(textfield.getText())){ - if(!textfield.isEmpty()) - getModelData(npc).setWalkAnim(textfield.getText()); - else - textfield.setText(getModelData(npc).getWalkAnim()); + if(textfield.id == 3 && (isValidAnimation(textfield.getText()) || textfield.getText().isEmpty())){ + getModelData(npc).setWalkAnim(textfield.getText()); } - if(textfield.id == 4 && isValidAnimation(textfield.getText())){ - if(!textfield.isEmpty()) - getModelData(npc).setMeleeAttackAnim(textfield.getText()); - else - textfield.setText(getModelData(npc).getMeleeAttackAnim()); + if(textfield.id == 4 && (isValidAnimation(textfield.getText()) || textfield.getText().isEmpty())){ + getModelData(npc).setMeleeAttackAnim(textfield.getText()); } - if(textfield.id == 5 && isValidAnimation(textfield.getText())){ - if(!textfield.isEmpty()) - getModelData(npc).setRangedAttackAnim(textfield.getText()); - else - textfield.setText(getModelData(npc).getRangedAttackAnim()); + if(textfield.id == 5 && (isValidAnimation(textfield.getText()) || textfield.getText().isEmpty())){ + getModelData(npc).setRangedAttackAnim(textfield.getText()); } - if(textfield.id == 6 && isValidAnimation(textfield.getText())){ - if(!textfield.isEmpty()) - getModelData(npc).setHurtAnim(textfield.getText()); - else - textfield.setText(getModelData(npc).getHurtAnim()); + if(textfield.id == 6 && (isValidAnimation(textfield.getText()) || textfield.getText().isEmpty())){ + getModelData(npc).setHurtAnim(textfield.getText()); } }