From fb071bb3fb76f6b83efe37d6a0677b12f2733e27 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Wed, 13 Jul 2022 23:01:32 +0200 Subject: [PATCH] Fix attribute slider ranges. Fixes #22 --- .../gui/content/impl/ContentCustomItem.java | 11 ++++++++--- .../worldhandler/gui/content/impl/ContentSummon.java | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java index fdf4101..e80bfdf 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentCustomItem.java @@ -69,10 +69,15 @@ public class ContentCustomItem extends Content for(Attribute attribute : this.attributes.getAttributes()) { double value = this.attributes.get(attribute); + double range = Config.getSliders().getMaxItemAttributes(); - if(value > Config.getSliders().getMaxItemAttributes()) + if(value > range) { - this.attributes.set(attribute, Config.getSliders().getMaxItemAttributes()); + this.attributes.set(attribute, range); + } + else if(value < -range) + { + this.attributes.set(attribute, -range); } } @@ -195,7 +200,7 @@ public class ContentCustomItem extends Content @Override public GuiButtonBase onRegister(int x, int y, int width, int height, MutableComponent text, Attribute attribute, ActionHandler actionHandler) { - return new GuiSlider(x, y, width, height, -Config.getSliders().getMaxItemAttributes(), Config.getSliders().getMaxItemEnchantment(), 0, container, new LogicSliderAttribute(attribute, text, value -> + return new GuiSlider(x, y, width, height, -Config.getSliders().getMaxItemAttributes(), Config.getSliders().getMaxItemAttributes(), 0, container, new LogicSliderAttribute(attribute, text, value -> { ContentCustomItem.this.attributes.set(attribute, value); })); diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java index e245ce7..7d37f30 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentSummon.java @@ -156,10 +156,15 @@ public class ContentSummon extends Content for(Attribute attribute : this.attributes.getAttributes()) { double value = this.attributes.get(attribute); + double range = Config.getSliders().getMaxSummonAttributes(); - if(value > Config.getSliders().getMaxSummonAttributes()) + if(value > range) { - this.attributes.set(attribute, Config.getSliders().getMaxSummonAttributes()); + this.attributes.set(attribute, range); + } + else if(value < -range) + { + this.attributes.set(attribute, -range); } }