aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWyvest <45589059+Wyvest@users.noreply.github.com>2022-07-02 06:12:23 +0700
committerWyvest <45589059+Wyvest@users.noreply.github.com>2022-07-02 06:12:23 +0700
commitd4bb5a94308d4379ef3d6cc7b9221ea0d98ff051 (patch)
tree9bb9b53e2823f73084780673763504f4098bae69
parentd2b1d57120bb51e76191302a58d935afe52b89df (diff)
downloadOneConfig-d4bb5a94308d4379ef3d6cc7b9221ea0d98ff051.tar.gz
OneConfig-d4bb5a94308d4379ef3d6cc7b9221ea0d98ff051.tar.bz2
OneConfig-d4bb5a94308d4379ef3d6cc7b9221ea0d98ff051.zip
Separate Minecraft dependant and non-dependant code
-rw-r--r--build.gradle.kts237
-rw-r--r--settings.gradle.kts18
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java8
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/config/profiles/Profiles.java16
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/events/event/ChatReceiveEvent.java11
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/events/event/ReceivePacketEvent.java6
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/events/event/ScreenOpenEvent.java5
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/events/event/SendPacketEvent.java5
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/events/event/TimerUpdateEvent.java19
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/GuiPause.java9
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java65
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java25
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java8
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java18
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java8
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/Slider.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigDropdown.java22
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSwitch.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigTextBox.java4
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java17
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/pages/Page.java8
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/hud/Hud.java12
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/hud/TextHud.java3
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/images/Image.java8
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/internal/config/OneConfigConfig.java14
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/internal/config/Preferences.java14
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/internal/config/core/ConfigCore.java2
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/internal/gui/BlurHandler.java140
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/internal/init/OneConfigInit.java2
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/internal/mixin/FontRendererMixin.java15
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/GLPlatform.java17
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/GuiPlatform.java8
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/I18nPlatform.java5
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/LoaderPlatform.java19
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/MousePlatform.java15
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/Platform.java55
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/platform/ServerPlatform.java7
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/renderer/RenderManager.java29
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/test/TestConfig_Test.java6
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/test/TestMod_Test.java14
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/test/TestMultilineHud_Test.java3
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/test/TestNanoVGGui_Test.java1
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/InputUtils.java13
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/commands/CommandManager.java328
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManager.java7
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java27
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/gui/OneUIScreen.java31
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/hypixel/HypixelUtils.java19
-rw-r--r--versions/build.gradle.kts306
-rw-r--r--versions/root.gradle.kts (renamed from root.gradle.kts)1
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/events/event/ChatReceiveEvent.java22
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/events/event/ReceivePacketEvent.java11
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/events/event/ScreenOpenEvent.java17
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/events/event/SendPacketEvent.java11
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/events/event/TimerUpdateEvent.java24
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java)18
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/gui/impl/BlurHandlerImpl.java132
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/GuiIngameForgeMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/MinecraftMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetHandlerPlayClientMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/NetworkManagerMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/OptifineConfigMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/OptifineConfigMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/ShaderGroupAccessor.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/ShaderGroupAccessor.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/VigilantMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/VigilantMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/mixin/WorldClientMixin.java)2
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/ClassTransformer.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/ClassTransformer.java)0
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/ITransformer.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/ITransformer.java)0
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/OneConfigTweaker.java)0
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/tweakers/NanoVGGLConfigTransformer.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/tweakers/NanoVGGLConfigTransformer.java)0
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/tweakers/VigilantTransformer.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/asm/tweakers/VigilantTransformer.java)0
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/hooks/Lwjgl2FunctionProvider.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/hooks/Lwjgl2FunctionProvider.java)12
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/hooks/OptifineConfigHook.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/hooks/OptifineConfigHook.java)7
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/internal/plugin/hooks/VigilantHook.java (renamed from src/main/java/cc/polyfrost/oneconfig/internal/plugin/hooks/VigilantHook.java)7
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/GLPlatformImpl.java67
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/GuiPlatformImpl.java31
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/I18nPlatformImpl.java13
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/LoaderPlatformImpl.java26
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/MousePlatformImpl.java53
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/PlatformImpl.java12
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/platform/impl/ServerPlatformImpl.java22
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/utils/commands/PlatformCommandManagerImpl.java330
-rw-r--r--versions/src/main/java/cc/polyfrost/oneconfig/utils/gui/GuiUtils.java100
-rw-r--r--versions/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt (renamed from src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/DSLs.kt)0
-rw-r--r--versions/src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/GuiUtilsDSL.kt (renamed from src/main/kotlin/cc/polyfrost/oneconfig/utils/dsl/GuiUtilsDSL.kt)0
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.internal.gui.BlurHandler1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.GLPlatform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.GuiPlatform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.I18nPlatform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.LoaderPlatform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.MousePlatform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.Platform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.platform.ServerPlatform1
-rw-r--r--versions/src/main/resources/META-INF/services/cc.polyfrost.oneconfig.utils.commands.PlatformCommandManager1
-rw-r--r--versions/src/main/resources/mixins.oneconfig.json (renamed from src/main/resources/mixins.oneconfig.json)1
98 files changed, 1628 insertions, 967 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index 1f20571..944612c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,25 +1,22 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import gg.essential.gradle.multiversion.StripReferencesTransform.Companion.registerStripReferencesAttribute
import gg.essential.gradle.util.RelocationTransform.Companion.registerRelocationAttribute
-import gg.essential.gradle.util.noServerRunConfigs
import gg.essential.gradle.util.prebundle
-import net.fabricmc.loom.task.RemapSourcesJarTask
plugins {
- kotlin("jvm")
- id("gg.essential.multi-version")
+ kotlin("jvm") version "1.6.21"
id("gg.essential.defaults.repo")
id("gg.essential.defaults.java")
- id("gg.essential.defaults.loom")
- id("com.github.johnrengelman.shadow")
id("net.kyori.blossom") version "1.3.0"
- id("io.github.juuxel.loom-quiltflower-mini")
- id("org.jetbrains.dokka") version "1.6.21"
id("maven-publish")
id("signing")
java
}
+kotlin.jvmToolchain {
+ (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(8))
+}
+
java {
withSourcesJar()
}
@@ -28,10 +25,6 @@ val mod_name: String by project
val mod_version: String by project
val mod_id: String by project
-preprocess {
- vars.put("MODERN", if (project.platform.mcMinor >= 16) 1 else 0)
-}
-
blossom {
replaceToken("@VER@", mod_version)
replaceToken("@NAME@", mod_name)
@@ -40,25 +33,6 @@ blossom {
version = mod_version
group = "cc.polyfrost"
-base {
- archivesName.set("$mod_id-$platform")
-}
-loom {
- noServerRunConfigs()
- if (project.platform.isLegacyForge) {
- launchConfigs.named("client") {
- arg("--tweakClass", "cc.polyfrost.oneconfig.internal.plugin.asm.OneConfigTweaker")
- property("mixin.debug.export", "true")
- property("debugBytecode", "true")
- }
- }
- if (project.platform.isForge) {
- forge {
- mixinConfig("mixins.${mod_id}.json")
- }
- }
- mixin.defaultRefmapName.set("mixins.${mod_id}.refmap.json")
-}
repositories {
maven("https://repo.polyfrost.cc/releases")
@@ -90,12 +64,29 @@ sourceSets {
}
}
+val common = registerStripReferencesAttribute("common") {
+ excludes.add("net.minecraft")
+ excludes.add("net.minecraftforge")
+}
+
dependencies {
- compileOnly("gg.essential:vigilance-$platform:222") {
+
+ compileOnly("com.google.code.gson:gson:2.2.4")
+ compileOnly("commons-io:commons-io:2.4")
+ compileOnly("com.google.guava:guava:17.0")
+ compileOnly("org.lwjgl:lwjgl-opengl:3.3.1")
+ compileOnly("org.apache.logging.log4j:log4j-core:2.0-beta9")
+ compileOnly("org.apache.logging.log4j:log4j-api:2.0-beta9")
+ compileOnly("org.ow2.asm:asm-debug-all:5.0.3")
+ compileOnly("org.apache.commons:commons-lang3:3.3.2")
+
+ compileOnly("gg.essential:vigilance-1.8.9-forge:222") {
+ attributes { attribute(common, true) }
isTransitive = false
}
- shadeRelocated("gg.essential:universalcraft-$platform:211") {
+ shadeRelocated("gg.essential:universalcraft-1.8.9-forge:211") {
+ attributes { attribute(common, true) }
isTransitive = false
}
@@ -130,197 +121,29 @@ dependencies {
shade("cc.polyfrost:lwjgl:1.0.0-alpha1")
shadeNoPom(prebundle(shadeRelocated))
- dokkaHtmlPlugin("org.jetbrains.dokka:kotlin-as-java-plugin:1.6.21")
-
configurations.named(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME) { extendsFrom(shadeNoPom) }
configurations.named(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME) { extendsFrom(shadeNoPom) }
}
-tasks.processResources {
- inputs.property("id", mod_id)
- inputs.property("name", mod_name)
- val java = if (project.platform.mcMinor >= 18) {
- 17
- } else {
- if (project.platform.mcMinor == 17) 16 else 8
- }
- val compatLevel = "JAVA_${java}"
- inputs.property("java", java)
- inputs.property("java_level", compat