Update Cloth Config & Migrate to Architectury Loom

Signed-off-by: shedaniel <daniel@shedaniel.me>

7 files changed, 62 insertions, 353 deletions

diff --git a/.gitignore b/.gitignore
index e787a1c70..08a039b5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@
 .idea
 *.ipr
 *.iws
+.vscode
 
 # Sekrit files 
 private.properties
diff --git a/build.gradle b/build.gradle
index b9f36182f..9f8c3f7fe 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,32 +1,15 @@
 plugins {
-    id("fabric-loom") version("0.5-SNAPSHOT") apply false
+    id("forgified-fabric-loom") version("0.6.66") apply false
     id("maven-publish")
     id("java")
     id("java-library")
     id("net.minecrell.licenser") version("0.4.1")
     id("com.matthewprenger.cursegradle") version("1.4.0")
-    id("net.corda.plugins.jar-filter") version("5.0.8") apply false
 }
 
-import net.fabricmc.loom.LoomGradleExtension
 import net.fabricmc.loom.task.RemapJarTask
-import net.fabricmc.loom.util.DownloadUtil
-import net.fabricmc.loom.util.MinecraftVersionInfo
-import net.fabricmc.lorenztiny.TinyMappingsReader
-import net.fabricmc.mapping.tree.TinyMappingFactory
-import org.cadixdev.lorenz.MappingSet
-import org.cadixdev.lorenz.io.TextMappingsWriter
-import org.cadixdev.lorenz.io.proguard.ProGuardReader
-import org.cadixdev.lorenz.model.*
-import org.zeroturnaround.zip.ByteSource
-import org.zeroturnaround.zip.ZipEntrySource
-import org.zeroturnaround.zip.ZipUtil
-
-import java.nio.charset.StandardCharsets
-import java.nio.file.Files
-import java.nio.file.Path
+
 import java.text.SimpleDateFormat
-import java.util.function.Consumer
 
 archivesBaseName = "RoughlyEnoughItems"
 
@@ -43,43 +26,40 @@ static def buildTime() {
 
 allprojects {
     apply plugin: 'maven-publish'
-    apply plugin: 'fabric-loom'
+    apply plugin: 'forgified-fabric-loom'
     apply plugin: 'net.minecrell.licenser'
-    apply plugin: 'net.corda.plugins.jar-filter'
 
     sourceCompatibility = targetCompatibility = 1.8
 
     loom {
-        shareCaches = true
+        silentMojangMappingsLicense()
+//        shareCaches = true
     }
 
     repositories {
-        maven { url "https://dl.bintray.com/shedaniel/shedaniel-mods" }
-        maven { url "https://dl.bintray.com/shedaniel/cloth" }
-        mavenLocal()
+        maven { url "https://maven.shedaniel.me" }
+        maven { url "https://maven.terraformersmc.com/releases" }
     }
 
-    afterEvaluate {
-        processResources {
-            filesMatching('fabric.mod.json') {
-                expand 'version': project.version
-            }
-            inputs.property "version", project.version
+    processResources {
+        filesMatching('fabric.mod.json') {
+            expand 'version': project.version
         }
+        inputs.property "version", project.version
+    }
 
-        license {
-            header rootProject.file('HEADER')
-            include '**/*.java'
-        }
+    license {
+        header rootProject.file('HEADER')
+        include '**/*.java'
+    }
 
-        jar {
-            from rootProject.file("LICENSE")
-        }
+    jar {
+        from rootProject.file("LICENSE")
     }
 
     dependencies {
         minecraft("com.mojang:minecraft:${project.minecraft_version}")
-        mappings(new MojangMappingsDependency(project, loom))
+        mappings(loom.officialMojangMappings())
         modApi("net.fabricmc:fabric-loader:${project.fabricloader_version}")
         modApi(fabricApi.module("fabric-api-base", project.fabric_api))
         modApi(fabricApi.module("fabric-resource-loader-v0", project.fabric_api))
@@ -89,17 +69,14 @@ allprojects {
         modApi("me.shedaniel.cloth.api:cloth-client-events-v0:${cloth_client_events_v0_version}") {
             transitive(false)
         }
-        modApi("me.shedaniel.cloth:config-2:${cloth_config_version}") {
-            exclude(module: "fabric-api")
-        }
-        modApi("me.sargunvohra.mcmods:autoconfig1u:${project.autoconfig1u}") {
+        modApi("me.shedaniel.cloth:cloth-config:${cloth_config_version}:fabric") {
             exclude(module: "fabric-api")
         }
         modApi("org.jetbrains:annotations:19.0.0")
-        modCompileOnly("io.github.prospector:modmenu:${modmenu_version}") {
+        modCompileOnly("com.terraformersmc:modmenu:${modmenu_version}") {
             transitive(false)
         }
-        modRuntime("io.github.prospector:modmenu:${modmenu_version}") {
+        modRuntime("com.terraformersmc:modmenu:${modmenu_version}") {
             transitive(false)
         }
         modRuntime("me.shedaniel:SmoothScrollingEverywhere:3.0.3-unstable") {
@@ -144,7 +121,6 @@ subprojects {
     }
 
     remapJar {
-        input.set(file("${project.buildDir}/filtered-libs/$archivesBaseName-${project.version}-dev-filtered.jar"))
         classifier(null)
     }
 
@@ -153,24 +129,6 @@ subprojects {
         remapped file: file("${project.buildDir}/libs/$archivesBaseName-${version}.jar"), type: "jar", builtBy: remapJar
     }
 
-    task jarFilter(type: net.corda.gradle.jarfilter.JarFilterTask) {
-        jars jar
-        annotations {
-            forRemove = [
-                    "org.jetbrains.annotations.NotNull",
-                    "org.jetbrains.annotations.Nullable",
-                    "org.jetbrains.annotations.ApiStatus\$Experimental",
-                    "org.jetbrains.annotations.ApiStatus\$Internal",
-                    "org.jetbrains.annotations.ApiStatus\$ScheduledForRemoval",
-                    "org.jetbrains.annotations.ApiStatus\$AvailableSince",
-                    "org.jetbrains.annotations.ApiStatus\$NonExtendable",
-                    "org.jetbrains.annotations.ApiStatus\$OverrideOnly"
-            ]
-        }
-    }
-
-    remapJar.dependsOn("jarFilter")
-
     publishing {
         publications {
             create("${archivesBaseName}_mavenJava", MavenPublication) {
@@ -204,41 +162,15 @@ subprojects { licenseFormatAll.dependsOn("${path}:licenseFormat") }
 subprojects { rootProject.remapJar.dependsOn("${path}:remapJar") }
 
 task remapMavenJar(type: RemapJarTask, dependsOn: jar) {
-    afterEvaluate {
-        input.set(file("${project.buildDir}/libs/${archivesBaseName}-${project.version}-dev.jar"))
-        archiveFileName = "${archivesBaseName}-${project.version}-maven.jar"
-        addNestedDependencies.set(false)
-    }
+    input.set(file("${project.buildDir}/libs/${archivesBaseName}-${project.version}-dev.jar"))
+    archiveFileName = "${archivesBaseName}-${project.version}-maven.jar"
+    addNestedDependencies.set(false)
 }
 
 dependencies {
-    afterEvaluate {
-        subprojects.each {
-            implementation project(path: ":${it.name}", configuration: "dev")
-            include project(path: ":${it.name}", configuration: "remapped")
-        }
-
-        def listAdded = new ArrayList(Arrays.asList((api_exculde as String).split(',')))
-        def eachDep = { dep ->
-            for (apiIncludeDepStr in (api_include as String).split(',')) {
-                if (apiIncludeDepStr.isEmpty()) continue
-                def apiIncludeGroup = apiIncludeDepStr.split(':')[0]
-                def apiIncludeDep = apiIncludeDepStr.split(':')[1]
-                if (dep.module.id.group == apiIncludeGroup && dep.module.id.name.startsWith(apiIncludeDep)) {
-                    def version = dep.module.id.version.indexOf('@') >= 0 ? dep.module.id.version.substring(0, dep.module.id.version.indexOf('@')) : dep.module.id.version
-                    def mavenDep = "${dep.module.id.group}:${dep.module.id.name}:$version"
-                    if (!(mavenDep in listAdded)) {
-                        include(mavenDep) {
-                            transitive = false
-                        }
-                        listAdded.add(mavenDep)
-                    }
-                    break
-                }
-            }
-        }
-        rootProject.configurations.compileClasspath.resolvedConfiguration.firstLevelModuleDependencies.each eachDep
-        rootProject.configurations.runtimeClasspath.resolvedConfiguration.firstLevelModuleDependencies.each eachDep
+    subprojects.each {
+        compile project(path: ":${it.name}", configuration: "dev")
+        include project(path: ":${it.name}", configuration: "remapped")
     }
 }
 
@@ -299,9 +231,7 @@ curseforge {
             addArtifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}-sources.jar")) {
                 displayName = "[Fabric $project.supported_version] v$project.version Sources"
             }
-            afterEvaluate {
-                uploadTask.dependsOn("build")
-            }
+            uploadTask.dependsOn("build")
         }
     }
     options {
@@ -344,222 +274,3 @@ publishing {
         }
     }
 }
-
-/*
-The following code is licensed under MIT License.
-
-Copyright (c) 2016 FabricMC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-class MojangMappingsDependency implements SelfResolvingDependency {
-    private final Project project
-    private final LoomGradleExtension extension
-
-    MojangMappingsDependency(Project project, LoomGradleExtension extension) {
-        this.project = project
-        this.extension = extension
-    }
-
-    @Override
-    Set<File> resolve() {
-        Path mappingsDir = extension.getMappingsProvider().getMappingsDir()
-        Path mappingsFile = mappingsDir.resolve(String.format("net.mojang.minecraft-mappings-%s.tiny", getVersion()))
-        Path clientMappings = mappingsDir.resolve(String.format("net.mojang.minecraft.mappings-%s-client.map", getVersion()))
-        Path serverMappings = mappingsDir.resolve(String.format("net.mojang.minecraft.mappings-%s-server.map", getVersion()))
-
-        if (!Files.exists(mappingsFile) || project.getGradle().getStartParameter().isRefreshDependencies()) {
-            MappingSet mappingSet
-
-            try {
-                mappingSet = getMappingsSet(clientMappings, serverMappings)
-
-                Writer writer = new StringWriter()
-                new TinyWriter(writer, "intermediary", "named").write(mappingSet)
-                Files.deleteIfExists(mappingsFile)
-
-                ZipUtil.pack([
-                        new ByteSource("mappings/mappings.tiny", writer.toString().getBytes(StandardCharsets.UTF_8))
-                ] as ZipEntrySource[], mappingsFile.toFile())
-                writer.close()
-            } catch (IOException e) {
-                throw new RuntimeException("Failed to resolve Mojang mappings", e)
-            }
-        }
-
-        return Collections.singleton(mappingsFile.toFile())
-    }
-
-    private MappingSet getMappingsSet(Path clientMappings, Path serverMappings) throws IOException {
-        MinecraftVersionInfo versionInfo = extension.getMinecraftProvider().getVersionInfo()
-
-        if (versionInfo.downloads.get("client_mappings") == null) {
-            throw new RuntimeException("Failed to find official mojang mappings for " + getVersion())
-        }
-
-        String clientMappingsUrl = versionInfo.downloads.get("client_mappings").url
-        String serverMappingsUrl = versionInfo.downloads.get("server_mappings").url
-
-        DownloadUtil.downloadIfChanged(new URL(clientMappingsUrl), clientMappings.toFile(), project.getLogger())
-        DownloadUtil.downloadIfChanged(new URL(serverMappingsUrl), serverMappings.toFile(), project.getLogger())
-
-        MappingSet mappings = MappingSet.create()
-
-        BufferedReader clientBufferedReader = Files.newBufferedReader(clientMappings, StandardCharsets.UTF_8)
-        BufferedReader serverBufferedReader = Files.newBufferedReader(serverMappings, StandardCharsets.UTF_8)
-        ProGuardReader proGuardReaderClient = new ProGuardReader(clientBufferedReader)
-        ProGuardReader proGuardReaderServer = new ProGuardReader(serverBufferedReader)
-        proGuardReaderClient.read(mappings)
-        proGuardReaderServer.read(mappings)
-
-        clientBufferedReader.close()
-        serverBufferedReader.close()
-        proGuardReaderClient.close()
-        proGuardReaderServer.close()
-
-        MappingSet officialToNamed = mappings.reverse()
-        MappingSet intermediaryToOfficial
-
-        BufferedReader reader = Files.newBufferedReader(extension.getMappingsProvider().getIntermediaryTiny(), StandardCharsets.UTF_8)
-        intermediaryToOfficial = new TinyMappingsReader(TinyMappingFactory.loadWithDetection(reader), "intermediary", "official").read()
-        reader.close()
-
-        MappingSet intermediaryToMojang = MappingSet.create()
-
-        // Merging. Don't use MappingSet#merge
-        iterateClasses(intermediaryToOfficial, { inputMappings ->
-            officialToNamed.getClassMapping(inputMappings.getFullDeobfuscatedName())
-                    .ifPresent({ namedClass ->
-                        ClassMapping mojangClassMapping = intermediaryToMojang.getOrCreateClassMapping(inputMappings.getFullObfuscatedName())
-                                .setDeobfuscatedName(namedClass.getFullDeobfuscatedName())
-
-                        for (FieldMapping fieldMapping : inputMappings.getFieldMappings()) {
-                            namedClass.getFieldMapping(fieldMapping.getDeobfuscatedName())
-                                    .ifPresent({ namedField ->
-                                        mojangClassMapping.getOrCreateFieldMapping(fieldMapping.getSignature())
-                                                .setDeobfuscatedName(namedField.getDeobfuscatedName())
-                                    })
-                        }
-
-                        for (MethodMapping methodMapping : inputMappings.getMethodMappings()) {
-                            namedClass.getMethodMapping(methodMapping.getDeobfuscatedSignature())
-                                    .ifPresent({ namedMethod ->
-                                        mojangClassMapping.getOrCreateMethodMapping(methodMapping.getSignature())
-                                                .setDeobfuscatedName(namedMethod.getDeobfuscatedName())
-                                    })
-                        }
-                    })
-        })
-
-        return intermediaryToMojang
-    }
-
-    @Override
-    Set<File> resolve(boolean transitive) {
-        return resolve()
-    }
-
-    @Override
-    TaskDependency getBuildDependencies() {
-        return { Collections.emptySet() }
-    }
-
-    @Override
-    String getGroup() {
-        return "net.mojang.minecraft"
-    }
-
-    @Override
-    String getName() {
-        return "mappings"
-    }
-
-    @Override
-    String getVersion() {
-        return extension.getMinecraftProvider().getMinecraftVersion()
-    }
-
-    @Override
-    boolean contentEquals(Dependency dependency) {
-        if (dependency instanceof MojangMappingsDependency) {
-            return ((MojangMappingsDependency) dependency).extension.getMinecraftProvider().getMinecraftVersion() == getVersion()
-        }
-
-        return false
-    }
-
-    @Override
-    Dependency copy() {
-        return new MojangMappingsDependency(project, extension)
-    }
-
-    @Override
-    String getReason() {
-        return null
-    }
-
-    @Override
-    void because(String s) {
-    }
-
-    private static void iterateClasses(MappingSet mappings, Closure<ClassMapping> consumer) {
-        for (TopLevelClassMapping classMapping : mappings.getTopLevelClassMappings()) {
-            iterateClass(classMapping, consumer)
-        }
-    }
-
-    private static void iterateClass(ClassMapping classMapping, Consumer<ClassMapping> consumer) {
-        consumer.accept(classMapping)
-
-        for (InnerClassMapping innerClassMapping : classMapping.getInnerClassMappings()) {
-            iterateClass(innerClassMapping, consumer)
-        }
-    }
-
-    private static class TinyWriter extends TextMappingsWriter {
-        private final String namespaceFrom
-        private final String namespaceTo
-
-        protected TinyWriter(Writer writer, String namespaceFrom, String namespaceTo) {
-            super(writer)
-            this.namespaceFrom = namespaceFrom
-            this.namespaceTo = namespaceTo
-        }
-
-        @Override
-        void write(MappingSet mappings) {
-            writer.println("tiny\t2\t0\t" + namespaceFrom + "\t" + namespaceTo)
-
-            iterateClasses(mappings, { classMapping ->
-                writer.println("c\t" + classMapping.getFullObfuscatedName() + "\t" + classMapping.getFullDeobfuscatedName())
-
-                for (FieldMapping fieldMapping : classMapping.getFieldMappings()) {
-                    fieldMapping.getType().ifPresent({ fieldType ->
-                        writer.println("\tf\t" + fieldType + "\t" + fieldMapping.getObfuscatedName() + "\t" + fieldMapping.getDeobfuscatedName())
-                    })
-                }
-
-                for (MethodMapping methodMapping : classMapping.getMethodMappings()) {
-                    writer.println("\tm\t" + methodMapping.getSignature().getDescriptor() + "\t" + methodMapping.getObfuscatedName() + "\t" + methodMapping.getDeobfuscatedName())
-                }
-            })
-        }
-    }
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 74b51f755..308d0424b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,13 @@
 org.gradle.jvmargs=-Xmx3G
 mod_version=6.0.0
 unstable=true
-supported_version=20w51a
-minecraft_version=20w51a
-fabricloader_version=0.10.8
-cloth_client_events_v0_version=2.0.0
-cloth_config_version=5.0.0
-modmenu_version=2.0.0-beta.1+build.2
-fabric_api=0.29.0+1.17
-autoconfig1u=3.3.1
+supported_version=1.16.2/3/4/5
+minecraft_version=1.16.5
+fabricloader_version=0.11.1
+cloth_client_events_v0_version=1.5.47
+cloth_config_version=4.10.9
+modmenu_version=1.16.7
+fabric_api=0.30.0+1.16
 architectury_version=2.0.57
 api_include=me.shedaniel.cloth.api:cloth-client-events-v0,me.shedaniel.cloth:config-2,me.sargunvohra.mcmods:autoconfig1u,net.fabricmc.fabric-api:fabric-api-base
 api_exculde=
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7ca6abcf2..18cd7f0cc 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
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;
diff --git a/settings.gradle b/settings.gradle
index 344c0409c..e84a49712 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,8 @@
 pluginManagement {
     repositories {
-        jcenter()
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
+        maven { url "https://maven.shedaniel.me/" }
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://files.minecraftforge.net/maven/" }
         gradlePluginPortal()
     }
 }