diff options
Diffstat (limited to 'runtime/src')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java | 28 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java | 14 |
2 files changed, 21 insertions, 21 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java index 43e50d7b0..6a7ffecd3 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigManagerImpl.java @@ -30,18 +30,18 @@ import com.google.gson.JsonElement; import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Matrix4f; -import me.sargunvohra.mcmods.autoconfig1u.AutoConfig; -import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; -import me.sargunvohra.mcmods.autoconfig1u.gui.ConfigScreenProvider; -import me.sargunvohra.mcmods.autoconfig1u.gui.registry.GuiRegistry; -import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Jankson; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.JsonNull; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.JsonObject; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.JsonPrimitive; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.impl.SyntaxError; -import me.sargunvohra.mcmods.autoconfig1u.util.Utils; +import me.shedaniel.autoconfig.AutoConfig; +import me.shedaniel.autoconfig.annotation.ConfigEntry; +import me.shedaniel.autoconfig.gui.ConfigScreenProvider; +import me.shedaniel.autoconfig.gui.registry.GuiRegistry; +import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer; +import me.shedaniel.autoconfig.util.Utils; import me.shedaniel.cloth.api.client.events.v0.ScreenHooks; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Jankson; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.JsonNull; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.JsonObject; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.JsonPrimitive; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.api.SyntaxError; import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; import me.shedaniel.clothconfig2.api.Modifier; import me.shedaniel.clothconfig2.api.ModifierKeyCode; @@ -90,8 +90,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; -import static me.sargunvohra.mcmods.autoconfig1u.util.Utils.getUnsafely; -import static me.sargunvohra.mcmods.autoconfig1u.util.Utils.setUnsafely; +import static me.shedaniel.autoconfig.util.Utils.getUnsafely; +import static me.shedaniel.autoconfig.util.Utils.setUnsafely; @ApiStatus.Internal @Environment(EnvType.CLIENT) @@ -162,7 +162,7 @@ public class ConfigManagerImpl implements ConfigManager { guiRegistry.registerAnnotationProvider((i13n, field, config, defaults, guiProvider) -> { ConfigObjectImpl.UsePercentage bounds = field.getAnnotation(ConfigObjectImpl.UsePercentage.class); return Collections.singletonList(ConfigEntryBuilder.create().startIntSlider(new TranslatableComponent(i13n), Mth.ceil(Utils.getUnsafely(field, config, 0.0) * 100), Mth.ceil(bounds.min() * 100), Mth.ceil(bounds.max() * 100)).setDefaultValue(() -> Mth.ceil((double) Utils.getUnsafely(field, defaults) * 100)).setSaveConsumer((newValue) -> { - Utils.setUnsafely(field, config, newValue / 100d); + setUnsafely(field, config, newValue / 100d); }).setTextGetter(integer -> new TextComponent(bounds.prefix() + String.format("%d%%", integer))).build()); }, (field) -> field.getType() == Double.TYPE || field.getType() == Double.class, ConfigObjectImpl.UsePercentage.class); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java index fdfef10c9..41962a690 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/ConfigObjectImpl.java @@ -24,10 +24,10 @@ package me.shedaniel.rei.impl; import com.mojang.blaze3d.platform.InputConstants; -import me.sargunvohra.mcmods.autoconfig1u.ConfigData; -import me.sargunvohra.mcmods.autoconfig1u.annotation.Config; -import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry; -import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment; +import me.shedaniel.autoconfig.ConfigData; +import me.shedaniel.autoconfig.annotation.Config; +import me.shedaniel.autoconfig.annotation.ConfigEntry; +import me.shedaniel.cloth.clothconfig.shadowed.blue.endless.jankson.Comment; import me.shedaniel.clothconfig2.api.Modifier; import me.shedaniel.clothconfig2.api.ModifierKeyCode; import me.shedaniel.rei.api.ConfigObject; @@ -337,13 +337,13 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData { @ApiStatus.Experimental @Override public double getHorizontalEntriesBoundaries() { - return Mth.clamp(appearance.horizontalEntriesBoundaries, 0.1,1); + return Mth.clamp(appearance.horizontalEntriesBoundaries, 0.1, 1); } @ApiStatus.Experimental @Override public double getVerticalEntriesBoundaries() { - return Mth.clamp(appearance.verticalEntriesBoundaries, 0.1,1); + return Mth.clamp(appearance.verticalEntriesBoundaries, 0.1, 1); } @Override @@ -419,7 +419,7 @@ public class ConfigObjectImpl implements ConfigObject, ConfigData { @Comment("Declares whether the craftable filter button is enabled.") private boolean enableCraftableOnlyButton = false; @Comment("Declares whether the utils buttons are shown.") private boolean showUtilsButtons = false; } - + @UsePercentage(min = 0.1, max = 1.0, prefix = "Limit: ") private double horizontalEntriesBoundaries = 1.0; @UsePercentage(min = 0.1, max = 1.0, prefix = "Limit: ") private double verticalEntriesBoundaries = 1.0; @UseSpecialSearchFilterSyntaxHighlightingScreen private SyntaxHighlightingMode syntaxHighlightingMode = SyntaxHighlightingMode.COLORFUL; |