diff --git a/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java b/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java index cc87747..034795d 100644 --- a/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java +++ b/src/main/java/com/radimous/vhatcaniroll/logic/Modifiers.java @@ -204,8 +204,11 @@ public class Modifiers { MutableComponent res = null; if (modifierTiers.size() > 1) { res = rangeComponent(atrName, atr, atrGenerator, minConfig, maxConfig); + if (res != null) { + return res; + } } - if (res == null && minConfigDisplay != null) { + if (minConfigDisplay != null) { res = minConfigDisplay.withStyle(atr.getReader().getColoredTextStyle()); if (minConfig instanceof AbilityLevelAttribute.Config minConfigAbility) { return abilityLvlComponent(res, atr, minConfigAbility); diff --git a/src/main/java/com/radimous/vhatcaniroll/ui/GearModifierScreen.java b/src/main/java/com/radimous/vhatcaniroll/ui/GearModifierScreen.java index eaabd6f..5c9d6bd 100644 --- a/src/main/java/com/radimous/vhatcaniroll/ui/GearModifierScreen.java +++ b/src/main/java/com/radimous/vhatcaniroll/ui/GearModifierScreen.java @@ -195,7 +195,7 @@ public class GearModifierScreen extends AbstractElementScreen { Minecraft.getInstance().font) .layout(this.translateWorldSpatial()) ); - + inputElement.onTextChanged(s -> updateModifierList(true)); return inputElement; } @@ -211,10 +211,10 @@ public class GearModifierScreen extends AbstractElementScreen { .layout(this.translateWorldSpatial()); NineSliceButtonElement btnMinus = new NineSliceButtonElement<>(Spatials.positionXY(this.getGuiSpatial().width() - 72 - 13, 35).size(15, 14), - ScreenTextures.BUTTON_EMPTY_TEXTURES, lvlInput::increment).layout(this.translateWorldSpatial()); + ScreenTextures.BUTTON_EMPTY_TEXTURES, lvlInput::decrement).layout(this.translateWorldSpatial()); NineSliceButtonElement btnPlus = new NineSliceButtonElement<>(Spatials.positionXY(this.getGuiSpatial().width() - 25 - 13, 35).size(15, 14), - ScreenTextures.BUTTON_EMPTY_TEXTURES, lvlInput::decrement).layout(this.translateWorldSpatial()); + ScreenTextures.BUTTON_EMPTY_TEXTURES, lvlInput::increment).layout(this.translateWorldSpatial()); this.addElement(btnMinus); this.addElement(minusLabel); this.addElement(plusLabel); @@ -270,8 +270,8 @@ public class GearModifierScreen extends AbstractElementScreen { if (keyCode == InputConstants.KEY_TAB && hasShiftDown()) { switchTab((currIndex - 1 + Items.getVaultGearItems().size()) % Items.getVaultGearItems().size()); } - // alt to toggle legendary - if (keyCode == InputConstants.KEY_LALT || keyCode == InputConstants.KEY_RALT) { + // ctrl to change tier increase (normal, greater, legendary) + if (keyCode == InputConstants.KEY_LCONTROL || keyCode == InputConstants.KEY_RCONTROL) { toggleLegend(); } // ctrl + , to toggle compact +lvl to abilities diff --git a/src/main/java/com/radimous/vhatcaniroll/ui/ScrollableLvlInputElement.java b/src/main/java/com/radimous/vhatcaniroll/ui/ScrollableLvlInputElement.java index 508f806..82b5932 100644 --- a/src/main/java/com/radimous/vhatcaniroll/ui/ScrollableLvlInputElement.java +++ b/src/main/java/com/radimous/vhatcaniroll/ui/ScrollableLvlInputElement.java @@ -12,6 +12,11 @@ import net.minecraft.client.gui.Font; public class ScrollableLvlInputElement extends TextInputElement { public ScrollableLvlInputElement(ISpatial spatial, Font font) { super(spatial, font); + this.adjustEditBox(editBox -> { + editBox.setFilter(s -> isValidLevel(parseInt(s))); + editBox.setMaxLength(3); + editBox.setValue(String.valueOf(VaultBarOverlay.vaultLevel)); + }); } @Override @@ -22,11 +27,6 @@ public class ScrollableLvlInputElement extends TextInputElement { - editBox.setFilter(s -> isValidLevel(parseInt(s))); - editBox.setMaxLength(3); - editBox.setValue(String.valueOf(VaultBarOverlay.vaultLevel)); - }); return super.onMouseScrolled(mouseX, mouseY, delta); }