diff --git a/build.gradle.kts b/build.gradle.kts index 4d6cab03f..8c9afd072 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,52 +1,30 @@ -import org.quiltmc.gradle.licenser.extension.QuiltLicenserGradleExtension - plugins { - alias(libs.plugins.kotlin) apply false - alias(libs.plugins.pgt.defaults.repo) apply false - alias(libs.plugins.licenser) apply false + alias(libs.plugins.kotlin) apply(false) + alias(libs.plugins.licenser) apply(false) alias(libs.plugins.jetbrains.idea.ext) -} -val major = project.properties["version_major"] -val minor = project.properties["version_minor"] -val patch = project.properties["version_patch"] + alias(libs.plugins.dgt.base) apply(false) +} -version = "$major.$minor.$patch" -group = properties["group"] as String +// Note for future devs: DON'T apply the java-library plugin to subprojects here. +// This will cause loom to completely break apart and throw itself into oblivion. +// I have no idea how to fix it, and honestly, I don't want to know. subprojects { - version = rootProject.version - group = "${rootProject.group}.${rootProject.properties["mod_id"] as String}" - - apply(plugin = rootProject.libs.plugins.licenser.get().pluginId) - // Note for future devs: DON'T apply the java-library plugin to subprojects here. - // This will cause loom to completely break apart and throw itself into oblivion. - // I have no idea how to fix it, and honestly, I don't want to know. - apply(plugin = "maven-publish") - apply(plugin = "signing") - - afterEvaluate { // ew. - if (project.pluginManager.hasPlugin("java")) { - configure { - withSourcesJar() - } - } - } - -// configure { -// rule("${rootProject.rootDir}/FILEHEADER") -// include("**/*.kt") -// include("**/*.java") -// } - - configure { - repositories { - arrayOf("releases", "snapshots", "private").forEach { type -> - maven { - name = type - url = uri("https://repo.polyfrost.org/$type") - credentials(PasswordCredentials::class) - authentication { create("basic") } + pluginManager.withPlugin("java") { + apply(plugin = rootProject.libs.plugins.licenser.get().pluginId) + apply(plugin = rootProject.libs.plugins.dgt.publishing.maven.get().pluginId) + apply(plugin = "signing") + + configure { + repositories { + arrayOf("releases", "snapshots", "private").forEach { type -> + maven { + name = type + url = uri("https://repo.polyfrost.org/$type") + credentials(PasswordCredentials::class) + authentication { create("basic") } + } } } } diff --git a/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt b/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt index 47957a3a2..899abd360 100644 --- a/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt +++ b/buildSrc/src/main/kotlin/org/polyfrost/gradle/addDependencies.kt @@ -47,6 +47,7 @@ fun Project.provideIncludedDependencies(version: Triple?, loader: in 16..18 -> "3.2.2" 19 -> "3.3.1" 20 -> "3.3.2" + 21 -> "3.3.3" else -> error("Unsupported Minecraft version: ${version.toMCVer()}") } @@ -76,6 +77,7 @@ fun Project.provideIncludedDependencies(version: Triple?, loader: } if (version != null) { actualDeps.add(OCDependency("org.polyfrost:universalcraft-${version.toMCVer()}-$loader:${libs.findVersion("universalcraft").get().displayName}", true)) + actualDeps.add(OCDependency("dev.deftu:omnicore-${version.toMCVer()}-$loader:${libs.findVersion("omnicore").get().displayName}", true)) } return actualDeps } diff --git a/gradle.properties b/gradle.properties index 66f9777d3..dc4a52d1a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,15 @@ -group=org.polyfrost -name=OneConfig -mod_id=oneconfig -version_major=1 -version_minor=0 -version_patch=0-alpha.65 - -polyfrost.defaults.loom=3 +# Gradle Configuration -- DO NOT TOUCH THESE VALUES. +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.configureoncommand=true +org.gradle.parallel.threads=4 +org.gradle.jvmargs=-Xmx2G kotlin.code.style=official -org.gradle.parallel=true -org.gradle.caching=true -#org.gradle.configuration-cache=true -org.gradle.configureondemand=true -org.gradle.parallel.threads=4 -org.gradle.dependency.verification=strict -org.gradle.kotlin.dsl.allWarningsAsErrors=true -org.gradle.kotlin.dsl.precompiled.accessors.strict=true -org.gradle.workers.max=4 -org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8 +dgt.java.version=8 + +# Project Configuration +project.group=org.polyfrost +project.name=OneConfig +project.version=1.0.0-alpha.66 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d2ad3409b..2e729be46 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,7 @@ copycat = "0.1.3" copycat-image-awt = "0.1.1" # Per version +omnicore = "0.12.0" universalcraft = "2.0.0" lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader @@ -29,10 +30,9 @@ mixin-extras = "0.4.1" asm = "5.2" # Gradle +dgt = "2.24.0" kotlinx-abi = "0.14.0" -pgt = "0.6.6" -shadow = "8.1.1" -licenser = "2.0.1" +licenser = "2.1.1" jetbrains-idea-ext = "1.1.8" log4j-api = "2.0-beta9" # used because this is the version that 1.8.9 supports, so we have to compile against the same (annoying) @@ -97,14 +97,16 @@ test-core = ["junit", "logging-impl"] kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlinx-api-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "kotlinx-abi" } -pgt-main = { id = "org.polyfrost.multi-version", version.ref = "pgt" } -pgt-root = { id = "org.polyfrost.multi-version.root", version.ref = "pgt" } -pgt-api-validator = { id = "org.polyfrost.multi-version.api-validation", version.ref = "pgt" } -pgt-default = { id = "org.polyfrost.defaults", version.ref = "pgt" } -pgt-defaults-repo = { id = "org.polyfrost.defaults.repo", version.ref = "pgt" } -pgt-defaults-java = { id = "org.polyfrost.defaults.java", version.ref = "pgt" } - -shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } -licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "licenser" } +dgt-base = { id = "dev.deftu.gradle.tools", version.ref = "dgt" } +dgt-multiversion-platform = { id = "dev.deftu.gradle.multiversion", version.ref = "dgt" } +dgt-multiversion-root = { id = "dev.deftu.gradle.multiversion-root", version.ref = "dgt" } +dgt-java = { id = "dev.deftu.gradle.tools.java", version.ref = "dgt" } +dgt-kotlin = { id = "dev.deftu.gradle.tools.kotlin", version.ref = "dgt" } +dgt-resources = { id = "dev.deftu.gradle.tools.resources", version.ref = "dgt" } +dgt-shadow = { id = "dev.deftu.gradle.tools.shadow", version.ref = "dgt" } +dgt-publishing-maven = { id = "dev.deftu.gradle.tools.publishing.maven", version.ref = "dgt" } +dgt-loom = { id = "dev.deftu.gradle.tools.minecraft.loom", version.ref = "dgt" } + +licenser = { id = "dev.yumi.gradle.licenser", version.ref = "licenser" } jetbrains-idea-ext = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-idea-ext" } diff --git a/versions/.gitignore b/minecraft/.gitignore similarity index 100% rename from versions/.gitignore rename to minecraft/.gitignore diff --git a/versions/README.md b/minecraft/README.md similarity index 100% rename from versions/README.md rename to minecraft/README.md diff --git a/minecraft/build.gradle.kts b/minecraft/build.gradle.kts new file mode 100644 index 000000000..b56cd3d9c --- /dev/null +++ b/minecraft/build.gradle.kts @@ -0,0 +1,161 @@ +@file:Suppress("UnstableApiUsage") +// Shared build logic for all versions of OneConfig. + +import dev.deftu.gradle.utils.GameSide +import dev.deftu.gradle.utils.MinecraftVersion +import dev.deftu.gradle.utils.includeOrShade +import org.polyfrost.gradle.provideIncludedDependencies +import java.text.SimpleDateFormat + +plugins { + java + alias(libs.plugins.kotlin) + id(libs.plugins.dgt.multiversion.platform.get().pluginId) + id(libs.plugins.dgt.base.get().pluginId) + id(libs.plugins.dgt.resources.get().pluginId) + id(libs.plugins.dgt.loom.get().pluginId) + id(libs.plugins.dgt.shadow.get().pluginId) +} + +toolkitLoomHelper { + disableRunConfigs(GameSide.SERVER) + + useProperty("mixin.debug.export", "true", GameSide.CLIENT) + useProperty("debugBytecode", "true", GameSide.CLIENT) + useProperty("forge.logging.console.level", "debug", GameSide.CLIENT) + if (org.gradle.internal.os.OperatingSystem.current().isMacOsX) { + useProperty("fml.earlyprogresswindow", "false", GameSide.CLIENT) + } + + if (mcData.isForge) { + useForgeMixin(modData.id) + } + + if (mcData.isLegacyForge) { + useTweaker("org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker") + } +} + +if (mcData.isForge) { + loom.forge.mixinConfig("mixins.${modData.id}.init.json") +} + +repositories { + maven("https://repo.polyfrost.org/releases") + maven("https://repo.polyfrost.org/snapshots") + maven("https://repo.hypixel.net/repository/Hypixel/") + maven("https://maven.deftu.dev/releases") +} + +val shadow by configurations.creating + +if (mcData.isLegacyForge) { // Quick substitution for relaunch in dev env, so that mixinextras works properly (yay!) + configurations.all { + resolutionStrategy { + dependencySubstitution { + all { + if (requested is ModuleComponentSelector) { + val module = (requested as ModuleComponentSelector) + if (module.group == "org.ow2.asm" && module.version == "5.0.3") { + logger.warn("Substituting ${module.group}:${module.module}:${module.version} with ${libs.asm.get()}") + useTarget(module.group + ":" + module.module + ":" + libs.asm.get().version) + } + } + } + } + } + } +} + +dependencies { + compileOnly("gg.essential:vigilance-1.8.9-forge:295") { + isTransitive = false + } + + provideIncludedDependencies(Triple(mcData.version.major, mcData.version.minor, mcData.version.patch), mcData.loader.friendlyString).forEach { + if (it.dep is String) { + shade(it.dep as String, it.mod) + } else { + shade(it.dep as ExternalModuleDependency, it.mod) + } + } + + annotationProcessor(libs.mixin.extras) + + for (dep in listOf("-nanovg").run { if (mcData.version < MinecraftVersion.VERSION_1_13) this else this + listOf("-tinyfd", "-stb", "") }) { + val lwjglDep = "org.lwjgl:lwjgl$dep:${libs.versions.lwjgl.get()}" + compileOnlyApi(lwjglDep) { + isTransitive = false + } + } + + implementation(project(":modules:dependencies:bundled")) + implementation(project(":modules:internal")) { + isTransitive = false + } + + if (mcData.isLegacyForge) { + compileOnly("cc.polyfrost:oneconfig-$mcData:0.2.2-alpha216") { + isTransitive = false + } + } +} + +fun DependencyHandlerScope.shade(dependency: String, isMod: Boolean = false) { + val dep = project.dependencies.create(dependency) as ExternalModuleDependency + shade(dep, isMod) +} + +fun DependencyHandlerScope.shade(dependency: Provider, isMod: Boolean = false) { + shade(dependency.get(), isMod) +} + +fun DependencyHandlerScope.shade(dependency: ExternalModuleDependency, isMod: Boolean = false) { + val dep = "${dependency.group}:${dependency.name}:${dependency.version}" + val configuration = if (isMod) modApi(dep) { + isTransitive = false + } else api(dep) { + isTransitive = false + } + + includeOrShade(configuration) +} + +tasks { + remapJar { + manifest { + val attributesMap = buildMap { + putAll( + mapOf( + "Specification-Title" to modData.id, + "Specification-Vendor" to "Polyfrost", + "Specification-Version" to "1", // We are version 1 of ourselves, whatever the hell that means + "Implementation-Title" to rootProject.name, + "Implementation-Version" to project.version, + "Implementation-Vendor" to "Polyfrost", + "Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(`java.util`.Date()), + "OneConfig-Main-Class" to "org.polyfrost.oneconfig.internal.bootstrap.Bootstrap" + ) + ) + } + + attributes(attributesMap) + } + } +} + +publishing { + publications { + register("java") { + from(components["java"]) + + groupId = group.toString() + artifactId = base.archivesName.get() + + signing { + isRequired = project.properties["signing.keyId"] != null + sign(this@register) + } + } + } +} \ No newline at end of file diff --git a/minecraft/gradle.properties b/minecraft/gradle.properties new file mode 100644 index 000000000..e941d6635 --- /dev/null +++ b/minecraft/gradle.properties @@ -0,0 +1,4 @@ +dgt.loom.mappings.flavor=parchment + +mod.name=OneConfig +mod.id=oneconfig diff --git a/versions/mappings/fabric-1.17.1-1.16.5.txt b/minecraft/mappings/fabric-1.17.1-1.16.5.txt similarity index 100% rename from versions/mappings/fabric-1.17.1-1.16.5.txt rename to minecraft/mappings/fabric-1.17.1-1.16.5.txt diff --git a/versions/mappings/fabric-1.19.4-1.18.2.txt b/minecraft/mappings/fabric-1.19.2-1.18.2.txt similarity index 100% rename from versions/mappings/fabric-1.19.4-1.18.2.txt rename to minecraft/mappings/fabric-1.19.2-1.18.2.txt diff --git a/versions/1.12.2-fabric/.gitkeep b/minecraft/mappings/fabric-1.19.4-1.19.2.txt similarity index 100% rename from versions/1.12.2-fabric/.gitkeep rename to minecraft/mappings/fabric-1.19.4-1.19.2.txt diff --git a/versions/mappings/fabric-forge-1.16.5.txt b/minecraft/mappings/fabric-forge-1.16.5.txt similarity index 100% rename from versions/mappings/fabric-forge-1.16.5.txt rename to minecraft/mappings/fabric-forge-1.16.5.txt diff --git a/versions/mappings/fabric-forge-1.8.9.txt b/minecraft/mappings/fabric-forge-1.8.9.txt similarity index 100% rename from versions/mappings/fabric-forge-1.8.9.txt rename to minecraft/mappings/fabric-forge-1.8.9.txt diff --git a/versions/mappings/forge-1.12.2-1.8.9.txt b/minecraft/mappings/forge-1.12.2-1.8.9.txt similarity index 100% rename from versions/mappings/forge-1.12.2-1.8.9.txt rename to minecraft/mappings/forge-1.12.2-1.8.9.txt diff --git a/versions/mappings/forge-1.16.5-1.12.2.txt b/minecraft/mappings/forge-1.16.5-1.12.2.txt similarity index 95% rename from versions/mappings/forge-1.16.5-1.12.2.txt rename to minecraft/mappings/forge-1.16.5-1.12.2.txt index 471096b32..d50278530 100644 --- a/versions/mappings/forge-1.16.5-1.12.2.txt +++ b/minecraft/mappings/forge-1.16.5-1.12.2.txt @@ -8,9 +8,9 @@ net.minecraft.client.entity.player.ClientPlayerEntity net.minecraft.client.entit net.minecraft.client.gui.screen.ChatScreen net.minecraft.client.gui.GuiChat -net.minecraft.client.gui.screen.Screen isPauseScreen() doesGuiPauseGame() -net.minecraft.client.gui.screen.Screen net.minecraft.client.gui.GuiScreen -net.minecraft.client.gui.screen.Screen resize() onResize() +net.minecraft.client.gui.screens.Screen isPauseScreen() doesGuiPauseGame() +net.minecraft.client.gui.screens.Screen net.minecraft.client.gui.GuiScreen +net.minecraft.client.gui.screens.Screen resize() onResize() net.minecraft.client.gui.widget.button.Button net.minecraft.client.gui.GuiButton net.minecraft.client.gui.widget.button.Button playDownSound() playPressSound() diff --git a/versions/mappings/forge-1.17.1-1.16.5.txt b/minecraft/mappings/forge-1.17.1-1.16.5.txt similarity index 100% rename from versions/mappings/forge-1.17.1-1.16.5.txt rename to minecraft/mappings/forge-1.17.1-1.16.5.txt diff --git a/versions/mappings/forge-1.18.2-1.17.1.txt b/minecraft/mappings/forge-1.18.2-1.17.1.txt similarity index 100% rename from versions/mappings/forge-1.18.2-1.17.1.txt rename to minecraft/mappings/forge-1.18.2-1.17.1.txt diff --git a/versions/mappings/forge-1.19.4-1.18.2.txt b/minecraft/mappings/forge-1.19.4-1.18.2.txt similarity index 100% rename from versions/mappings/forge-1.19.4-1.18.2.txt rename to minecraft/mappings/forge-1.19.4-1.18.2.txt diff --git a/versions/mappings/forge-1.20.4-1.19.4.txt b/minecraft/mappings/forge-1.20.4-1.19.4.txt similarity index 100% rename from versions/mappings/forge-1.20.4-1.19.4.txt rename to minecraft/mappings/forge-1.20.4-1.19.4.txt diff --git a/versions/preprocessor.gradle.kts b/minecraft/root.gradle.kts similarity index 55% rename from versions/preprocessor.gradle.kts rename to minecraft/root.gradle.kts index 0637f8b8b..7567ec5a9 100644 --- a/versions/preprocessor.gradle.kts +++ b/minecraft/root.gradle.kts @@ -1,6 +1,13 @@ +import dev.deftu.gradle.utils.ModData +import dev.deftu.gradle.utils.ProjectData + plugins { - alias(libs.plugins.kotlin) apply false - id(libs.plugins.pgt.root.get().pluginId) + id(libs.plugins.dgt.multiversion.root.get().pluginId) +} + +subprojects { + val projectData = ProjectData.from(rootProject) + ModData.populateFrom(project, projectData) } preprocess { @@ -16,13 +23,25 @@ preprocess { val fabric11701 = createNode("1.17.1-fabric", 11701, "yarn") val forge11802 = createNode("1.18.2-forge", 11802, "srg") val fabric11802 = createNode("1.18.2-fabric", 11802, "yarn") + val forge11902 = createNode("1.19.2-forge", 11902, "srg") + val fabric11902 = createNode("1.19.2-fabric", 11902, "yarn") val forge11904 = createNode("1.19.4-forge", 11904, "srg") val fabric11904 = createNode("1.19.4-fabric", 11904, "yarn") + val forge12001 = createNode("1.20.1-forge", 12001, "srg") + val fabric12001 = createNode("1.20.1-fabric", 12001, "yarn") val fabric12004 = createNode("1.20.4-fabric", 12004, "yarn") val forge12004 = createNode("1.20.4-forge", 12004, "srg") + val fabric12006 = createNode("1.20.6-fabric", 12006, "yarn") +// val fabric12101 = createNode("1.21.1-fabric", 12101, "yarn") +// val fabric12104 = createNode("1.21.4-fabric", 12104, "yarn") - fabric12004.link(fabric11904) - fabric11904.link(fabric11802, file("mappings/fabric-1.19.4-1.18.2.txt")) +// fabric12104.link(fabric12101) +// fabric12101.link(fabric12006) + fabric12006.link(fabric12004) + fabric12004.link(fabric12001) + fabric12001.link(fabric11904) + fabric11904.link(fabric11902, file("mappings/fabric-1.19.4-1.19.2.txt")) + fabric11902.link(fabric11802, file("mappings/fabric-1.19.2-1.18.2.txt")) fabric11802.link(fabric11701) fabric11701.link(fabric11605, file("mappings/fabric-1.17.1-1.16.5.txt")) fabric11605.link(forge11605, file("mappings/fabric-forge-1.16.5.txt")) @@ -30,8 +49,10 @@ preprocess { fabric11202.link(fabric10809) fabric10809.link(forge10809, file("mappings/fabric-forge-1.8.9.txt")) - forge12004.link(forge11904, file("mappings/forge-1.20.4-1.19.4.txt")) - forge11904.link(forge11802, file("mappings/forge-1.19.4-1.18.2.txt")) + forge12004.link(forge12001, file("mappings/forge-1.20.4-1.20.1.txt")) + forge12001.link(forge11904, file("mappings/forge-1.20.1-1.19.4.txt")) + forge11904.link(forge11902, file("mappings/forge-1.19.4-1.19.2.txt")) + forge11902.link(forge11802, file("mappings/forge-1.19.2-1.18.2.txt")) forge11802.link(forge11701, file("mappings/forge-1.18.2-1.17.1.txt")) forge11701.link(forge11605, file("mappings/forge-1.17.1-1.16.5.txt")) forge11605.link(forge11202, file("mappings/forge-1.16.5-1.12.2.txt")) diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/commands/v1/arguments/PlayerArgumentParser.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/commands/v1/arguments/PlayerArgumentParser.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/commands/v1/arguments/PlayerArgumentParser.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/commands/v1/arguments/PlayerArgumentParser.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/hypixel/v1/internal/HypixelApiInternalsImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/hypixel/v1/internal/HypixelApiInternalsImpl.java similarity index 93% rename from versions/src/main/java/org/polyfrost/oneconfig/api/hypixel/v1/internal/HypixelApiInternalsImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/hypixel/v1/internal/HypixelApiInternalsImpl.java index 2c30898b8..38af6aae2 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/api/hypixel/v1/internal/HypixelApiInternalsImpl.java +++ b/minecraft/src/main/java/org/polyfrost/oneconfig/api/hypixel/v1/internal/HypixelApiInternalsImpl.java @@ -67,20 +67,20 @@ private void registerHypixelApi() { PacketBuffer buf = new PacketBuffer(Unpooled.buffer()); packet.write(new PacketSerializer(buf)); net.addToSendQueue(new C17PacketCustomPayload( - //#if MC>12000 + //#if MC >= 1.20.4 //#if FORGE //$$ new net.minecraft.network.protocol.common.custom.DiscardedPayload( //#else //$$ new Payload( //#endif //#endif - //#if MC<=11202 + //#if MC <= 1.12.2 packet.getIdentifier(), - //#else + //#elseif MC >= 1.20.4 //$$ new net.minecraft.util.ResourceLocation(packet.getIdentifier()), //#endif buf - //#if MC>12000 + //#if MC >= 1.20.4 //$$ ) //#endif ) @@ -93,8 +93,10 @@ private void registerHypixelApi() { } S3FPacketCustomPayload packet = ev.getPacket(); - //#if MC>12000 + //#if MC >= 1.20.4 //$$ String identifier = packet.payload().id().toString(); + //#elseif MC > 1.20 + //$$ String identifier = packet.getChannel().toString(); //#else //noinspection StringOperationCanBeSimplified String identifier = packet.getChannelName().toString(); @@ -105,7 +107,7 @@ private void registerHypixelApi() { try { PacketSerializer s = new PacketSerializer( - //#if MC>12000 && FABRIC + //#if MC >= 1.20.4 && FABRIC //$$ ((Payload) packet.payload()).data() //#else packet.getBufferData() @@ -123,7 +125,7 @@ public void postLocationEvent() { EventManager.INSTANCE.post(HypixelLocationEvent.INSTANCE); } - //#if MC>12000 && FABRIC + //#if MC >= 1.20.4 && FABRIC //$$ public static final class Payload implements net.minecraft.network.packet.CustomPayload { //$$ private final net.minecraft.util.Identifier id; //$$ private final io.netty.buffer.ByteBuf data; diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/DeobfuscationRemapper.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/DeobfuscationRemapper.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/DeobfuscationRemapper.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/DeobfuscationRemapper.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/GLPlatformImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/GLPlatformImpl.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/GLPlatformImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/GLPlatformImpl.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/I18nPlatformImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/I18nPlatformImpl.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/I18nPlatformImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/I18nPlatformImpl.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/LoaderPlatformImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/LoaderPlatformImpl.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/LoaderPlatformImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/LoaderPlatformImpl.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/PlayerPlatformImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/PlayerPlatformImpl.java similarity index 99% rename from versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/PlayerPlatformImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/PlayerPlatformImpl.java index 20adedb63..cb886455b 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/PlayerPlatformImpl.java +++ b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/PlayerPlatformImpl.java @@ -118,7 +118,7 @@ public void joinServer(@NotNull Server server) { //#endif //$$ address, //$$ data - //#if MC >= 1.20.4 + //#if MC >= 1.20 //$$ , false //#endif //$$ ); diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/ScreenPlatformImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/ScreenPlatformImpl.java similarity index 99% rename from versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/ScreenPlatformImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/ScreenPlatformImpl.java index 6313430e4..99bd385e4 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/ScreenPlatformImpl.java +++ b/minecraft/src/main/java/org/polyfrost/oneconfig/api/platform/v1/internal/ScreenPlatformImpl.java @@ -58,7 +58,7 @@ public boolean isInChat() { public boolean isInDebug() { //@formatter:off return Minecraft.getMinecraft() - //#if MC<12000 + //#if MC < 1.20.4 .gameSettings.showDebugInfo; //#elseif FABRIC //$$ .getDebugHud().shouldShowDebugHud(); diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/BlurHandler.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/BlurHandler.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/BlurHandler.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/BlurHandler.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/UIManagerImpl.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/UIManagerImpl.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/UIManagerImpl.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/UIManagerImpl.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/MCWindow.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/MCWindow.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/MCWindow.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/MCWindow.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/PolyUIScreen.java b/minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/PolyUIScreen.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/PolyUIScreen.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/wrappers/PolyUIScreen.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigEarlyMixinInit.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigEarlyMixinInit.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigEarlyMixinInit.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigEarlyMixinInit.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfigMixinInit.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java similarity index 95% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java index 72d4013b7..36c8bb4df 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java +++ b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/bootstrap/Bootstrap.java @@ -26,7 +26,7 @@ package org.polyfrost.oneconfig.internal.bootstrap; -//#if FORGE && MODERN==0 +//#if FORGE && MC >= 1.13 import net.minecraft.launchwrapper.Launch; //#endif @@ -35,12 +35,12 @@ import java.util.Map; public class Bootstrap { - //#if FORGE && MODERN==0 + //#if FORGE && MC >= 1.13 private org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker tweaker = new org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker(); //#endif public void init() { - //#if FORGE && MODERN==0 + //#if FORGE && MC >= 1.13 Map launchArgs = ((Map) Launch.blackboard.get("launchArgs")); List args = new ArrayList<>(); for (Map.Entry entry : launchArgs.entrySet()) { diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/legacy/OneConfigTweaker.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/legacy/OneConfigTweaker.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/legacy/OneConfigTweaker.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/legacy/OneConfigTweaker.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_OneConfigCrashChecker.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_OneConfigCrashChecker.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_OneConfigCrashChecker.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_OneConfigCrashChecker.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_ShaderListAccessor.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_ShaderListAccessor.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_ShaderListAccessor.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_ShaderListAccessor.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_SoundHandlerAccessor.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_SoundHandlerAccessor.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_SoundHandlerAccessor.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_SoundHandlerAccessor.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OneConfigV0CompatMixin.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OneConfigV0CompatMixin.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OneConfigV0CompatMixin.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OneConfigV0CompatMixin.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OptifineConfigMixin.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OptifineConfigMixin.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OptifineConfigMixin.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/OptifineConfigMixin.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/VigilantCompatMixin.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/VigilantCompatMixin.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/VigilantCompatMixin.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/VigilantCompatMixin.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatReceiveEvent_Forge.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatReceiveEvent_Forge.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatReceiveEvent_Forge.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatReceiveEvent_Forge.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatSendEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatSendEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatSendEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ChatSendEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_FramebufferRenderEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_FramebufferRenderEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_FramebufferRenderEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_FramebufferRenderEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_HudRenderEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_HudRenderEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_HudRenderEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_HudRenderEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_InitializationEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_InitializationEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_InitializationEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_InitializationEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent_Screen.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent_Screen.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent_Screen.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_KeyInputEvent_Screen.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent_Screen.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent_Screen.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent_Screen.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_MouseInputEvent_Screen.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_LeftAction.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_LeftAction.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_LeftAction.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_LeftAction.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_RightAction.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_RightAction.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_RightAction.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PlayerInteractEvent_RightAction.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PostWorldRenderEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PostWorldRenderEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PostWorldRenderEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_PostWorldRenderEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ReceivePacketEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ReceivePacketEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ReceivePacketEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ReceivePacketEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderLivingEntityEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderLivingEntityEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderLivingEntityEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_RenderLivingEntityEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ResizeEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ResizeEvent.java similarity index 82% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ResizeEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ResizeEvent.java index 3530606f1..15a113294 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ResizeEvent.java +++ b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ResizeEvent.java @@ -22,13 +22,13 @@ private void resizeCallback(int width, int height, CallbackInfo ci) { } //#else //$$ @Shadow - //$$ public abstract net.minecraft.client.MainWindow getMainWindow(); + //$$ public abstract com.mojang.blaze3d.platform.Window getWindow(); //$$ - //$$ @Inject(method = "updateWindowSize", at = @At("HEAD")) + //$$ @Inject(method = "resizeDisplay", at = @At("HEAD")) //$$ private void resizeCallback(CallbackInfo ci) { //$$ int[] w = new int[1]; //$$ int[] h = new int[1]; - //$$ org.lwjgl.glfw.GLFW.glfwGetWindowSize(this.getMainWindow().getHandle(), w, h); + //$$ org.lwjgl.glfw.GLFW.glfwGetWindowSize(this.getWindow().getWindow(), w, h); //$$ EventManager.INSTANCE.post(new ResizeEvent(w[0], h[0])); //$$ } //#endif diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ScreenOpenEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ScreenOpenEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ScreenOpenEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ScreenOpenEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SendPacketEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SendPacketEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SendPacketEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SendPacketEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ServerJoinEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ServerJoinEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ServerJoinEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ServerJoinEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ShutdownEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ShutdownEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ShutdownEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_ShutdownEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SoundPlayedEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SoundPlayedEvent.java similarity index 92% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SoundPlayedEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SoundPlayedEvent.java index e9d4bb76e..266a2895b 100644 --- a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SoundPlayedEvent.java +++ b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_SoundPlayedEvent.java @@ -35,12 +35,8 @@ private ISound onPlaySoundCallback(ISound value) { SoundEventAccessorComposite accessor = ((Mixin_SoundHandlerAccessor) this).getSndHandler().getSound(value.getSoundLocation()); SoundCategory category = (accessor == null ? null : accessor.getSoundCategory()); //#else - //#if MC == 1.12.2 && FABRIC - //$$ SoundCategory category = value.method_12534(); - //#else //$$ SoundCategory category = value.getCategory(); //#endif - //#endif String name = value.getSoundLocation().getResourcePath(); SoundPlayedEvent event = new SoundPlayedEvent(name, category, value); diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_TickEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_TickEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_TickEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_TickEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldLoadEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldLoadEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldLoadEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldLoadEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldUnloadEvent.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldUnloadEvent.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldUnloadEvent.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/events/Mixin_WorldUnloadEvent.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_ASMModParser_IgnoreForgeJava9Spam.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_ASMModParser_IgnoreForgeJava9Spam.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_ASMModParser_IgnoreForgeJava9Spam.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_ASMModParser_IgnoreForgeJava9Spam.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_FixScoreboardErrorSpam.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_FixScoreboardErrorSpam.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_FixScoreboardErrorSpam.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_FixScoreboardErrorSpam.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_JarDiscoverer_IgnoreForgeJava9Spam.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_JarDiscoverer_IgnoreForgeJava9Spam.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_JarDiscoverer_IgnoreForgeJava9Spam.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/fixes/Mixin_JarDiscoverer_IgnoreForgeJava9Spam.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_EnableHiDPI.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_EnableHiDPI.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_EnableHiDPI.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_EnableHiDPI.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI_Screen.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI_Screen.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI_Screen.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixDisplaySizeHiDPI_Screen.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixLoadingScreenHiDPI.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixLoadingScreenHiDPI.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixLoadingScreenHiDPI.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixLoadingScreenHiDPI.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixMousePositionHiDPI.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixMousePositionHiDPI.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixMousePositionHiDPI.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/hidpi/Mixin_FixMousePositionHiDPI.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/init/package-info.java b/minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/init/package-info.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/init/package-info.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/internal/mixin/init/package-info.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/test/TestCommand_Test.java b/minecraft/src/main/java/org/polyfrost/oneconfig/test/TestCommand_Test.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/test/TestCommand_Test.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/test/TestCommand_Test.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/test/TestConfig_Test.java b/minecraft/src/main/java/org/polyfrost/oneconfig/test/TestConfig_Test.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/test/TestConfig_Test.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/test/TestConfig_Test.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/test/TestMod_Test.java b/minecraft/src/main/java/org/polyfrost/oneconfig/test/TestMod_Test.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/test/TestMod_Test.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/test/TestMod_Test.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/test/package-info.java b/minecraft/src/main/java/org/polyfrost/oneconfig/test/package-info.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/test/package-info.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/test/package-info.java diff --git a/versions/src/main/java/org/polyfrost/oneconfig/utils/v1/forge/KotlinLanguageAdapter.java b/minecraft/src/main/java/org/polyfrost/oneconfig/utils/v1/forge/KotlinLanguageAdapter.java similarity index 100% rename from versions/src/main/java/org/polyfrost/oneconfig/utils/v1/forge/KotlinLanguageAdapter.java rename to minecraft/src/main/java/org/polyfrost/oneconfig/utils/v1/forge/KotlinLanguageAdapter.java diff --git a/versions/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/mc.kt b/minecraft/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/mc.kt similarity index 100% rename from versions/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/mc.kt rename to minecraft/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/mc.kt diff --git a/versions/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/screens.kt b/minecraft/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/screens.kt similarity index 100% rename from versions/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/screens.kt rename to minecraft/src/main/kotlin/org/polyfrost/oneconfig/utils/v1/dsl/screens.kt diff --git a/versions/src/main/resources/META-INF/mods.toml b/minecraft/src/main/resources/META-INF/mods.toml similarity index 97% rename from versions/src/main/resources/META-INF/mods.toml rename to minecraft/src/main/resources/META-INF/mods.toml index 410073e73..d993574bb 100644 --- a/versions/src/main/resources/META-INF/mods.toml +++ b/minecraft/src/main/resources/META-INF/mods.toml @@ -15,13 +15,13 @@ license="LGPL 3.0" # A list of mods - how many allowed here is determined by the individual mod loader [[mods]] #mandatory # The modid of the mod -modId="${id}" #mandatory +modId="${mod_id}" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build -version="${version}" #mandatory +version="${mod_version}" #mandatory # A display name for the mod -displayName="${name}" #mandatory +displayName="${mod_name}" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.commands.v1.factories.PlatformCommandFactory b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.commands.v1.factories.PlatformCommandFactory similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.commands.v1.factories.PlatformCommandFactory rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.commands.v1.factories.PlatformCommandFactory diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.hypixel.v1.internal.HypixelApiInternals b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.hypixel.v1.internal.HypixelApiInternals similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.hypixel.v1.internal.HypixelApiInternals rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.hypixel.v1.internal.HypixelApiInternals diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.GLPlatform b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.GLPlatform similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.GLPlatform rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.GLPlatform diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.I18nPlatform b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.I18nPlatform similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.I18nPlatform rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.I18nPlatform diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.LoaderPlatform b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.LoaderPlatform similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.LoaderPlatform rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.LoaderPlatform diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.Platform b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.Platform similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.Platform rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.Platform diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.PlayerPlatform b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.PlayerPlatform similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.PlayerPlatform rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.PlayerPlatform diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.ScreenPlatform b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.ScreenPlatform similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.ScreenPlatform rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.platform.v1.ScreenPlatform diff --git a/versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.ui.v1.UIManager b/minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.ui.v1.UIManager similarity index 100% rename from versions/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.ui.v1.UIManager rename to minecraft/src/main/resources/META-INF/services/org.polyfrost.oneconfig.api.ui.v1.UIManager diff --git a/versions/src/main/resources/assets/minecraft/shaders/post/fade_in_blur.json b/minecraft/src/main/resources/assets/minecraft/shaders/post/fade_in_blur.json similarity index 100% rename from versions/src/main/resources/assets/minecraft/shaders/post/fade_in_blur.json rename to minecraft/src/main/resources/assets/minecraft/shaders/post/fade_in_blur.json diff --git a/versions/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.fsh b/minecraft/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.fsh similarity index 100% rename from versions/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.fsh rename to minecraft/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.fsh diff --git a/versions/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.json b/minecraft/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.json similarity index 100% rename from versions/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.json rename to minecraft/src/main/resources/assets/minecraft/shaders/program/fade_in_blur.json diff --git a/versions/src/main/resources/fabric.mod.json b/minecraft/src/main/resources/fabric.mod.json similarity index 79% rename from versions/src/main/resources/fabric.mod.json rename to minecraft/src/main/resources/fabric.mod.json index 50aee366a..b726bd2ab 100644 --- a/versions/src/main/resources/fabric.mod.json +++ b/minecraft/src/main/resources/fabric.mod.json @@ -1,8 +1,8 @@ { "schemaVersion": 1, - "id": "${id}", - "name": "${name}", - "version": "${version}", + "id": "${mod_id}", + "name": "${mod_name}", + "version": "${mod_version}", "description": "OneConfig", "authors": [ "Polyfrost" @@ -24,8 +24,8 @@ }, "depends": { "fabricloader": ">=0.12.0", - "minecraft": "${mcVersionStr}", - "java": ">=${java}" + "minecraft": "${mc_version}", + "java": ">=${java_version}" }, "custom": { "modmenu": { diff --git a/versions/src/main/resources/mcmod.info b/minecraft/src/main/resources/mcmod.info similarity index 63% rename from versions/src/main/resources/mcmod.info rename to minecraft/src/main/resources/mcmod.info index d86ee8b21..6b3502479 100644 --- a/versions/src/main/resources/mcmod.info +++ b/minecraft/src/main/resources/mcmod.info @@ -1,10 +1,10 @@ [ { - "modid": "${id}", - "name": "${name}", + "modid": "${mod_id}", + "name": "${mod_name}", "description": "OneConfig", - "version": "${version}", - "mcversion": "1.8.9", + "version": "${mod_version}", + "mcversion": "${mc_version}", "url": "", "updateUrl": "", "authorList": [ diff --git a/versions/src/main/resources/mixins.oneconfig.init.json b/minecraft/src/main/resources/mixins.oneconfig.init.json similarity index 100% rename from versions/src/main/resources/mixins.oneconfig.init.json rename to minecraft/src/main/resources/mixins.oneconfig.init.json diff --git a/versions/src/main/resources/mixins.oneconfig.json b/minecraft/src/main/resources/mixins.oneconfig.json similarity index 100% rename from versions/src/main/resources/mixins.oneconfig.json rename to minecraft/src/main/resources/mixins.oneconfig.json diff --git a/versions/src/main/resources/pack.mcmeta b/minecraft/src/main/resources/pack.mcmeta similarity index 100% rename from versions/src/main/resources/pack.mcmeta rename to minecraft/src/main/resources/pack.mcmeta diff --git a/versions/1.12.2-forge/.gitkeep b/minecraft/versions/1.12.2-fabric/.gitkeep similarity index 100% rename from versions/1.12.2-forge/.gitkeep rename to minecraft/versions/1.12.2-fabric/.gitkeep diff --git a/versions/1.17.1-fabric/.gitkeep b/minecraft/versions/1.12.2-forge/.gitkeep similarity index 100% rename from versions/1.17.1-fabric/.gitkeep rename to minecraft/versions/1.12.2-forge/.gitkeep diff --git a/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java b/minecraft/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java similarity index 100% rename from versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java rename to minecraft/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java diff --git a/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java b/minecraft/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java similarity index 100% rename from versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java rename to minecraft/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java diff --git a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java similarity index 91% rename from versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java rename to minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java index 5e4437a05..56dab1bbf 100644 --- a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java +++ b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/PlatformCommandFactoryImpl.java @@ -37,14 +37,14 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder; import com.mojang.brigadier.tree.CommandNode; import net.minecraft.client.multiplayer.ClientSuggestionProvider; -import net.minecraft.command.arguments.BlockPosArgument; -import net.minecraft.command.arguments.EntityArgument; -import net.minecraft.command.arguments.GameProfileArgument; -import net.minecraft.command.arguments.ItemArgument; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; +import net.minecraft.commands.arguments.EntityArgument; +import net.minecraft.commands.arguments.GameProfileArgument; +import net.minecraft.commands.arguments.coordinates.BlockPosArgument; +import net.minecraft.commands.arguments.item.ItemArgument; +import net.minecraft.core.BlockPos; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.polyfrost.oneconfig.api.commands.v1.CommandManager; @@ -71,7 +71,7 @@ public class PlatformCommandFactoryImpl implements PlatformCommandFactory { static { registerIntrinsics(); - argTypeMap.put(PlayerEntity.class, EntityArgument::player); + argTypeMap.put(Player.class, EntityArgument::player); argTypeMap.put(Entity.class, EntityArgument::entity); argTypeMap.put(GameProfile.class, GameProfileArgument::gameProfile); argTypeMap.put(BlockPos.class, BlockPosArgument::blockPos); @@ -81,8 +81,11 @@ public class PlatformCommandFactoryImpl implements PlatformCommandFactory { argTypeMap.put(Long.class, LongArgumentType::longArg); argTypeMap.put(Boolean.class, BoolArgumentType::bool); argTypeMap.put(String.class, StringArgumentType::word); - //#if MC<11900 + //#if MC < 1.19 argTypeMap.put(ItemStack.class, ItemArgument::item); + //#elseif MC <= 1.19.2 + //$$ net.minecraft.command.CommandRegistryAccess a = new net.minecraft.command.CommandRegistryAccess(net.minecraft.util.registry.BuiltinRegistries.DYNAMIC_REGISTRY_MANAGER); + //$$ argTypeMap.put(ItemStack.class, () -> ItemStackArgumentType.itemStack(a)); //#else //#if FABRIC //$$ net.minecraft.command.CommandRegistryAccess a = net.minecraft.server.command.CommandManager.createRegistryAccess( @@ -179,15 +182,15 @@ public CompletableFuture listSuggestions(CommandContext cont private static void registerIntrinsics() { CommandManager.INSTANCE.registerParser( - new ArgumentParser() { + new ArgumentParser() { @Override - public PlayerEntity parse(@NotNull String arg) { + public Player parse(@NotNull String arg) { throw new RuntimeException("intrinsic"); } @Override - public Class getType() { - return PlayerEntity.class; + public Class getType() { + return Player.class; } }, new ArgumentParser() { diff --git a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/RegisterCommandsEvent.java b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/RegisterCommandsEvent.java similarity index 100% rename from versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/RegisterCommandsEvent.java rename to minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/RegisterCommandsEvent.java diff --git a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/libs/fabric/ClientCommandInternals.java b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/libs/fabric/ClientCommandInternals.java similarity index 93% rename from versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/libs/fabric/ClientCommandInternals.java rename to minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/libs/fabric/ClientCommandInternals.java index 193c08b45..f3b61c897 100644 --- a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/libs/fabric/ClientCommandInternals.java +++ b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/libs/fabric/ClientCommandInternals.java @@ -34,9 +34,10 @@ import com.mojang.brigadier.tree.CommandNode; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientSuggestionProvider; -import net.minecraft.profiler.IProfiler; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextComponentUtils; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.ComponentUtils; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.util.profiling.ProfilerFiller; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; @@ -82,10 +83,10 @@ public static boolean executeCommand(String command) { return false; } - ClientSuggestionProvider commandSource = client.getConnection().getSuggestionProvider(); + ClientSuggestionProvider commandSource = client.getConnection().getSuggestionsProvider(); - IProfiler profiler = client.getProfiler(); - profiler.startSection(command); + ProfilerFiller profiler = client.getProfiler(); + profiler.push(command); try { // TODO: Check for server commands before executing. @@ -109,7 +110,7 @@ public static boolean executeCommand(String command) { UChat.chat("&c" + e.getLocalizedMessage()); return true; } finally { - profiler.endSection(); + profiler.pop(); } } @@ -130,14 +131,14 @@ private static boolean isIgnoredException(CommandExceptionType type) { } // See ChatInputSuggestor.formatException. That cannot be used directly as it returns an OrderedText instead of a Text. - private static ITextComponent getErrorMessage(CommandSyntaxException e) { - ITextComponent message = TextComponentUtils.toTextComponent(e.getRawMessage()); + private static Component getErrorMessage(CommandSyntaxException e) { + Component message = ComponentUtils.fromMessage(e.getRawMessage()); String context = e.getContext(); //@formatter:off return context != null ? //#if MC<11900 - new net.minecraft.util.text.TranslationTextComponent + new net.minecraft.network.chat.TranslatableComponent //#else //#if FABRIC //$$ Text diff --git a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_LazyDataFixerUpper.java b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_LazyDataFixerUpper.java similarity index 90% rename from versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_LazyDataFixerUpper.java rename to minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_LazyDataFixerUpper.java index a28ae042f..737ed40d3 100644 --- a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_LazyDataFixerUpper.java +++ b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/Mixin_LazyDataFixerUpper.java @@ -29,7 +29,7 @@ //#if MC < 1.19 import com.mojang.datafixers.DataFixer; import com.mojang.datafixers.DataFixerBuilder; -import net.minecraft.util.datafix.DataFixesManager; +import net.minecraft.util.datafix.DataFixers; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @@ -40,10 +40,10 @@ * Modified from LazyDFU under the MIT licence. * Source: here */ -@Mixin(DataFixesManager.class) +@Mixin(DataFixers.class) public abstract class Mixin_LazyDataFixerUpper { - @Redirect(method = "createFixer", at = @At(value = "NEW", target = "com/mojang/datafixers/DataFixerBuilder", remap = false)) + @Redirect(method = "createFixerUpper", at = @At(value = "NEW", target = "com/mojang/datafixers/DataFixerBuilder", remap = false)) private static DataFixerBuilder optimize$lazydfu(int dataVersion) { return new DataFixerBuilder(dataVersion) { @Override diff --git a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_AppendCustomCommands.java b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_AppendCustomCommands.java similarity index 82% rename from versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_AppendCustomCommands.java rename to minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_AppendCustomCommands.java index 99b4b46aa..c9a54a5d6 100644 --- a/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_AppendCustomCommands.java +++ b/minecraft/versions/1.16.5-forge/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_AppendCustomCommands.java @@ -27,9 +27,9 @@ package org.polyfrost.oneconfig.internal.mixin.commands; import com.mojang.brigadier.CommandDispatcher; -import net.minecraft.client.network.play.ClientPlayNetHandler; -import net.minecraft.command.ISuggestionProvider; -import net.minecraft.network.play.server.SCommandListPacket; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.network.protocol.game.ClientboundCommandsPacket; import org.polyfrost.oneconfig.internal.libs.fabric.ClientCommandInternals; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -38,26 +38,26 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(ClientPlayNetHandler.class) +@Mixin(ClientPacketListener.class) public class Mixin_AppendCustomCommands { // Command API // // Modified from Fabric API under the Apache 2.0 License // // Source: https://github.com/FabricMC/fabric/blob/1.20.2/fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientPlayNetworkHandlerMixin.java // @Shadow - private CommandDispatcher commandDispatcher; + private CommandDispatcher commands; @Shadow @Final - private net.minecraft.client.multiplayer.ClientSuggestionProvider clientSuggestionProvider; + private net.minecraft.client.multiplayer.ClientSuggestionProvider suggestionsProvider; @SuppressWarnings({"unchecked", "rawtypes"}) - @Inject(method = "handleCommandList", at = @At("RETURN")) - private void commands$setup(SCommandListPacket packet, CallbackInfo info) { + @Inject(method = "handleCommands", at = @At("RETURN")) + private void commands$setup(ClientboundCommandsPacket packet, CallbackInfo info) { // Add the commands to the vanilla dispatcher for completion. // It's done here because both the server and the client commands have // to be in the same dispatcher and completion results. - ClientCommandInternals.addCommands((CommandDispatcher) this.commandDispatcher, this.clientSuggestionProvider); + ClientCommandInternals.addCommands((CommandDispatcher) this.commands, this.suggestionsProvider); } } diff --git a/versions/1.17.1-forge/.gitkeep b/minecraft/versions/1.17.1-fabric/.gitkeep similarity index 100% rename from versions/1.17.1-forge/.gitkeep rename to minecraft/versions/1.17.1-fabric/.gitkeep diff --git a/versions/1.18.2-fabric/.gitkeep b/minecraft/versions/1.17.1-forge/.gitkeep similarity index 100% rename from versions/1.18.2-fabric/.gitkeep rename to minecraft/versions/1.17.1-forge/.gitkeep diff --git a/versions/1.18.2-forge/.gitkeep b/minecraft/versions/1.18.2-fabric/.gitkeep similarity index 100% rename from versions/1.18.2-forge/.gitkeep rename to minecraft/versions/1.18.2-fabric/.gitkeep diff --git a/versions/1.19.4-forge/.gitkeep b/minecraft/versions/1.18.2-forge/.gitkeep similarity index 100% rename from versions/1.19.4-forge/.gitkeep rename to minecraft/versions/1.18.2-forge/.gitkeep diff --git a/versions/1.19.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/NetHandlerPlayClientMixin.java b/minecraft/versions/1.19.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/NetHandlerPlayClientMixin.java similarity index 100% rename from versions/1.19.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/NetHandlerPlayClientMixin.java rename to minecraft/versions/1.19.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/NetHandlerPlayClientMixin.java diff --git a/versions/1.8.9-forge/.gitkeep b/minecraft/versions/1.19.4-forge/.gitkeep similarity index 100% rename from versions/1.8.9-forge/.gitkeep rename to minecraft/versions/1.19.4-forge/.gitkeep diff --git a/versions/1.20.4-fabric/gradle.properties b/minecraft/versions/1.20.4-fabric/gradle.properties similarity index 100% rename from versions/1.20.4-fabric/gradle.properties rename to minecraft/versions/1.20.4-fabric/gradle.properties diff --git a/versions/1.20.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/hypixel/Mixin_CaptureHypixelPayloads.java b/minecraft/versions/1.20.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/hypixel/Mixin_CaptureHypixelPayloads.java similarity index 100% rename from versions/1.20.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/hypixel/Mixin_CaptureHypixelPayloads.java rename to minecraft/versions/1.20.4-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/hypixel/Mixin_CaptureHypixelPayloads.java diff --git a/versions/1.20.4-forge/gradle.properties b/minecraft/versions/1.20.4-forge/gradle.properties similarity index 100% rename from versions/1.20.4-forge/gradle.properties rename to minecraft/versions/1.20.4-forge/gradle.properties diff --git a/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/ClientCommandHandler.java b/minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/ClientCommandHandler.java similarity index 100% rename from versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/ClientCommandHandler.java rename to minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/api/commands/v1/internal/ClientCommandHandler.java diff --git a/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_ExecuteCommandsFromScreen.java b/minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_ExecuteCommandsFromScreen.java similarity index 100% rename from versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_ExecuteCommandsFromScreen.java rename to minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_ExecuteCommandsFromScreen.java diff --git a/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_IncludeCommandSuggestions.java b/minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_IncludeCommandSuggestions.java similarity index 100% rename from versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_IncludeCommandSuggestions.java rename to minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/commands/Mixin_IncludeCommandSuggestions.java diff --git a/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java b/minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java similarity index 100% rename from versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java rename to minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_ChatReceiveEvent_Fabric.java diff --git a/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java b/minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java similarity index 100% rename from versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java rename to minecraft/versions/1.8.9-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/fabric/Mixin_LoadShaderInvoker.java diff --git a/versions/api/platform.api b/minecraft/versions/1.8.9-forge/.gitkeep similarity index 100% rename from versions/api/platform.api rename to minecraft/versions/1.8.9-forge/.gitkeep diff --git a/versions/mainProject b/minecraft/versions/mainProject similarity index 100% rename from versions/mainProject rename to minecraft/versions/mainProject diff --git a/modules/dependencies/build.gradle.kts b/modules/dependencies/build.gradle.kts index 94376640d..d06e9fcea 100644 --- a/modules/dependencies/build.gradle.kts +++ b/modules/dependencies/build.gradle.kts @@ -1,6 +1,6 @@ allprojects { with(tasks) { - arrayOf("javadocJar", "sourcesJar").forEach { + arrayOf("javadocJar", "sourcesJar", "remapSourcesJar").forEach { findByName(it)?.enabled = false } } diff --git a/modules/dependencies/legacy/build.gradle.kts b/modules/dependencies/legacy/build.gradle.kts index 3f3fd9eb6..f759c778f 100644 --- a/modules/dependencies/legacy/build.gradle.kts +++ b/modules/dependencies/legacy/build.gradle.kts @@ -1,7 +1,7 @@ import org.polyfrost.gradle.provideIncludedDependencies plugins { - id("org.polyfrost.loom") + id("gg.essential.loom") } dependencies { @@ -14,4 +14,8 @@ dependencies { include(dep) } } -} \ No newline at end of file +} + +tasks.remapSourcesJar { + enabled = false +} diff --git a/modules/events/build.gradle.kts b/modules/events/build.gradle.kts index ff4c232cc..db2109344 100644 --- a/modules/events/build.gradle.kts +++ b/modules/events/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { compileOnly("org.polyfrost:universalcraft-1.8.9-forge:${libs.versions.universalcraft.get()}") + compileOnly("dev.deftu:omnicore-1.8.9-forge:${libs.versions.omnicore.get()}") api(project(":modules:utils")) } diff --git a/modules/hud/build.gradle.kts b/modules/hud/build.gradle.kts index 3015f8cce..28627e37b 100644 --- a/modules/hud/build.gradle.kts +++ b/modules/hud/build.gradle.kts @@ -29,6 +29,7 @@ dependencies { api(project(":modules:ui")) api(project(":modules:events")) compileOnly("org.polyfrost:universalcraft-1.8.9-forge:${libs.versions.universalcraft.get()}") + compileOnly("dev.deftu:omnicore-1.8.9-forge:${libs.versions.omnicore.get()}") } diff --git a/modules/internal/build.gradle.kts b/modules/internal/build.gradle.kts index ad48589c3..fe47dde4d 100644 --- a/modules/internal/build.gradle.kts +++ b/modules/internal/build.gradle.kts @@ -29,4 +29,5 @@ dependencies { api(project(":modules:events")) api(project(":modules:commands")) compileOnly("org.polyfrost:universalcraft-1.8.9-forge:${libs.versions.universalcraft.get()}") + compileOnly("dev.deftu:omnicore-1.8.9-forge:${libs.versions.omnicore.get()}") } \ No newline at end of file diff --git a/modules/root.gradle.kts b/modules/root.gradle.kts index 36b18c6c6..00a8d42dc 100644 --- a/modules/root.gradle.kts +++ b/modules/root.gradle.kts @@ -3,23 +3,29 @@ // Shared build logic between all OneConfig modules to reduce boilerplate. plugins { - id(libs.plugins.kotlinx.api.validator.get().pluginId) + alias(libs.plugins.kotlinx.api.validator) alias(libs.plugins.jetbrains.idea.ext) + id("maven-publish") + id("signing") } val rootModuleProject = project subprojects { - apply(plugin = "java-library") apply(plugin = "kotlin") + apply(plugin = rootProject.libs.plugins.dgt.java.get().pluginId) + apply(plugin = rootProject.libs.plugins.dgt.kotlin.get().pluginId) + apply(plugin = rootProject.libs.plugins.dgt.publishing.maven.get().pluginId) apply(plugin = "jvm-test-suite") - if (project.parent?.name == "dependencies") + if (project.parent?.name == "dependencies") { this.group = "${project.group}.dependencies" + } repositories { maven("https://repo.polyfrost.org/releases") maven("https://repo.polyfrost.org/snapshots") + maven("https://maven.deftu.dev/releases") } dependencies { @@ -98,7 +104,6 @@ subprojects { } } } - apiValidation { for (project in subprojects) { ignoredPackages.add("org.polyfrost.oneconfig.api.${project.name}.v1.internal") @@ -109,3 +114,4 @@ apiValidation { ignoredProjects.add("legacy") ignoredProjects.add("bundled") } + diff --git a/modules/ui/build.gradle.kts b/modules/ui/build.gradle.kts index c720ee984..4d93952a1 100644 --- a/modules/ui/build.gradle.kts +++ b/modules/ui/build.gradle.kts @@ -30,4 +30,5 @@ dependencies { testImplementation(libs.lwjgl.tinyfd) api(project(":modules:events")) compileOnly("org.polyfrost:universalcraft-1.8.9-forge:${libs.versions.universalcraft.get()}") + compileOnly("dev.deftu:omnicore-1.8.9-forge:${libs.versions.omnicore.get()}") } diff --git a/modules/utils/build.gradle.kts b/modules/utils/build.gradle.kts index 7faa9ab90..d54b591ae 100644 --- a/modules/utils/build.gradle.kts +++ b/modules/utils/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { compileOnly("org.polyfrost:universalcraft-1.8.9-forge:${libs.versions.universalcraft.get()}") + compileOnly("dev.deftu:omnicore-1.8.9-forge:${libs.versions.omnicore.get()}") @Suppress("VulnerableLibrariesLocal") // reason: we need to use version this because it is what 1.8.9 uses compileOnly("com.google.code.gson:gson:2.2.4") compileOnly(rootProject.libs.copycat) diff --git a/settings.gradle.kts b/settings.gradle.kts index ac377cecc..22e4b9759 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,13 +1,30 @@ -@file:Suppress("UnstableApiUsage") +@file:Suppress("PropertyName") + +import groovy.lang.MissingPropertyException pluginManagement { repositories { - gradlePluginPortal() + // Releases + maven("https://maven.deftu.dev/releases") + maven("https://maven.fabricmc.net") + maven("https://maven.architectury.dev/") + maven("https://maven.minecraftforge.net") + maven("https://repo.essential.gg/repository/maven-public") + maven("https://server.bbkr.space/artifactory/libs-release/") + maven("https://jitpack.io/") + + // Snapshots + maven("https://maven.deftu.dev/snapshots") mavenLocal() + + // Default + gradlePluginPortal() mavenCentral() - maven("https://repo.polyfrost.org/releases") { - name = "Polyfrost Releases" - } + } + + plugins { + kotlin("jvm") version("2.0.0") + id("dev.deftu.gradle.multiversion-root") version("2.22.0") } } @@ -24,11 +41,13 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version ("0.8.+") } -val name: String by settings -rootProject.name = name -if (rootDir.name != name) { +val projectName: String = extra["project.name"]?.toString() + ?: throw MissingPropertyException("mod.name has not been set.") + +rootProject.name = projectName +if (rootDir.name != projectName) { logger.error(""" - Root directory name (${rootDir.absolutePath}) does not match project name ($name)! + Root directory name (${rootDir.absolutePath}) does not match project name ($projectName)! This may cause issues with indexing and other tools (see https://youtrack.jetbrains.com/issue/IDEA-317606#focus=Comments-27-7257761.0-0 and https://stackoverflow.com/questions/77878944 ). If you are experiencing issues, please rename the root directory to match the project name, re-import the project, and invalidate caches if you are on IntelliJ. """.trimIndent()) @@ -39,12 +58,6 @@ project(":modules").apply { buildFileName = "root.gradle.kts" } -include(":platform") -project(":platform").apply { - projectDir = file("versions/") - buildFileName = "preprocessor.gradle.kts" -} - listOf( "config", "config-impl", @@ -61,7 +74,9 @@ listOf( include(":modules:$module") } -// FOR ALL NEW VERSIONS MAKE SURE TO INCLUDE THEM IN preprocessor.gradle.kts ! +// FOR ALL NEW VERSIONS MAKE SURE TO INCLUDE THEM IN root..gradle.kts ! +include(":minecraft") +project(":minecraft").buildFileName = "root.gradle.kts" listOf( "1.8.9-forge", "1.8.9-fabric", @@ -73,15 +88,22 @@ listOf( "1.17.1-fabric", "1.18.2-forge", "1.18.2-fabric", + "1.19.2-forge", + "1.19.2-fabric", "1.19.4-forge", "1.19.4-fabric", + "1.20.1-forge", + "1.20.1-fabric", "1.20.4-fabric", - "1.20.4-forge" + "1.20.4-forge", + "1.20.6-fabric", +// "1.21.1-fabric", +// "1.21.4-fabric" ).forEach { version -> - val proj = ":platform:$version" + val proj = ":minecraft:$version" include(proj) project(proj).apply { - projectDir = file("versions/$version") - buildFileName = "../build.gradle.kts" + projectDir = file("minecraft/versions/$version") + buildFileName = "../../build.gradle.kts" } } diff --git a/versions/build.gradle.kts b/versions/build.gradle.kts deleted file mode 100644 index db2d3aee5..000000000 --- a/versions/build.gradle.kts +++ /dev/null @@ -1,242 +0,0 @@ -@file:Suppress("UnstableApiUsage") -// Shared build logic for all versions of OneConfig. - -import org.polyfrost.gradle.provideIncludedDependencies -import org.polyfrost.gradle.util.noServerRunConfigs -import java.text.SimpleDateFormat - -plugins { - alias(libs.plugins.kotlin) - id(libs.plugins.pgt.main.get().pluginId) - id(libs.plugins.pgt.default.get().pluginId) - `java-library` -} - -val modId = properties["mod_id"] as String -val tweakClass = "org.polyfrost.oneconfig.internal.legacy.OneConfigTweaker" - -base.archivesName = platform.toString() -java.withSourcesJar() - -loom { - noServerRunConfigs() - runConfigs { - "client" { - if (project.platform.isLegacyForge) { - programArgs("--tweakClass", tweakClass) - } - property("mixin.debug.export", "true") - property("debugBytecode", "true") - property("forge.logging.console.level", "debug") - if (org.gradle.internal.os.OperatingSystem.current().isMacOsX) { - property("fml.earlyprogresswindow", "false") - } - } - } - if (project.platform.isForge) { - forge { - mixinConfig("mixins.${modId}.json", "mixins.${modId}.init.json") - } - } -} - -repositories { - maven("https://repo.polyfrost.org/releases") - maven("https://repo.polyfrost.org/snapshots") - maven("https://repo.hypixel.net/repository/Hypixel/") -} - -val shadow by configurations.creating - -if (platform.isLegacyForge) { // Quick substitution for relaunch in dev env, so that mixinextras works properly (yay!) - configurations.all { - resolutionStrategy { - dependencySubstitution { - all { - if (requested is ModuleComponentSelector) { - val module = (requested as ModuleComponentSelector) - if (module.group == "org.ow2.asm" && module.version == "5.0.3") { - logger.warn("Substituting ${module.group}:${module.module}:${module.version} with ${libs.asm.get()}") - useTarget(module.group + ":" + module.module + ":" + libs.asm.get().version) - } - } - } - } - } - } -} - -dependencies { - compileOnly("gg.essential:vigilance-1.8.9-forge:295") { - isTransitive = false - } - - provideIncludedDependencies(Triple(platform.mcMajor, platform.mcMinor, platform.mcPatch), platform.loaderStr).forEach { - if (it.dep is String) { - shade(it.dep as String, it.mod) - } else { - shade(it.dep as ExternalModuleDependency, it.mod) - } - } - - annotationProcessor(libs.mixin.extras) - - for (dep in listOf("-nanovg").run { if (platform.mcVersion < 11300) this else this + listOf("-tinyfd", "-stb", "") }) { - val lwjglDep = "org.lwjgl:lwjgl$dep:${libs.versions.lwjgl.get()}" - compileOnlyApi(lwjglDep) { - isTransitive = false - } - } - - implementation(project(":modules:dependencies:bundled")) - implementation(project(":modules:internal")) { - isTransitive = false - } - - if (platform.isLegacyForge) { - compileOnly("cc.polyfrost:oneconfig-${platform}:0.2.2-alpha216") { - isTransitive = false - } - } - - if (!platform.isLegacyFabric) { - modRuntimeOnly( - "me.djtheredstoner:DevAuth-" + - (if (platform.isForge) { - if (platform.isLegacyForge) "forge-legacy" else "forge-latest" - } else "fabric") - + ":1.1.2" - ) - } -} - -fun DependencyHandlerScope.shade(dependency: String, isMod: Boolean = false) { - val dep = project.dependencies.create(dependency) as ExternalModuleDependency - shade(dep, isMod) -} - -fun DependencyHandlerScope.shade(dependency: Provider, isMod: Boolean = false) { - shade(dependency.get(), isMod) -} - -fun DependencyHandlerScope.shade(dependency: ExternalModuleDependency, isMod: Boolean = false) { - val dep = "${dependency.group}:${dependency.name}:${dependency.version}" - val configuration = if (isMod) modApi(dep) { - isTransitive = false - } else api(dep) { - isTransitive = false - } - if (platform.isFabric || platform.mcVersion >= 11900) { - include(configuration) - } else if (!platform.isLegacyForge) { - shadow(configuration) - } -} - -tasks { - withType(Jar::class) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - exclude("META-INF/com.android.tools/**") - exclude("META-INF/proguard/**") - if (platform.isFabric) { - exclude("mcmod.info", "META-INF/mods.toml") - } else { - exclude("fabric.mod.json") - if (platform.isLegacyForge) { - exclude("**/mods.toml") - exclude("META-INF/versions/**") - exclude("**/module-info.class") - exclude("**/package-info.class") - } else { - exclude("mcmod.info") - } - } - exclude("**/**_Test.**") - exclude("**/**_Test$**.**") - } - remapJar { - from(shadow.files.map { zipTree(it) }) - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } - processResources { - inputs.property("id", rootProject.properties["mod_id"].toString()) - inputs.property("name", rootProject.name) - inputs.property("java", 8) - inputs.property("version", version) - inputs.property( - "mcVersionStr", - if (platform.isFabric) platform.mcVersionStr.substringBeforeLast('.') + ".x" else platform.mcVersionStr - ) - - val id = inputs.properties["id"] - val name = inputs.properties["name"] - val version = inputs.properties["version"] - val mcVersionStr = inputs.properties["mcVersionStr"].toString() - val java = inputs.properties["java"].toString().toInt() - val javaLevel = "JAVA-$java" - - filesMatching(listOf("mcmod.info", "mixins.${id}.json", "**/mods.toml", "fabric.mod.json")) { - expand( - mapOf( - "id" to id, - "name" to name, - "java" to java, - "java_level" to javaLevel, - "version" to version, - "mcVersionStr" to mcVersionStr - ) - ) - } - } - - remapJar { - manifest { - val attributesMap = buildMap { - if (platform.isForge) { - if (platform.isLegacyForge) { - putAll( - mapOf( - "ModSide" to "CLIENT", - "ForceLoadAsMod" to true, - "TweakOrder" to "0", - "MixinConfigs" to "mixins.$modId.json,mixins.$modId.init.json", - "TweakClass" to tweakClass - ) - ) - } else { - put("MixinConfigs", "mixins.$modId.json,mixins.$modId.init.json") - } - } - putAll( - mapOf( - "Specification-Title" to modId, - "Specification-Vendor" to "Polyfrost", - "Specification-Version" to "1", // We are version 1 of ourselves, whatever the hell that means - "Implementation-Title" to rootProject.name, - "Implementation-Version" to project.version, - "Implementation-Vendor" to "Polyfrost", - "Implementation-Timestamp" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ").format(`java.util`.Date()), - "OneConfig-Main-Class" to "org.polyfrost.oneconfig.internal.bootstrap.Bootstrap" - ) - ) - } - attributes(attributesMap) - } - } -} - -publishing { - publications { - register("java") { - from(components["java"]) - - groupId = group.toString() - artifactId = base.archivesName.get() - - signing { - isRequired = project.properties["signing.keyId"] != null - sign(this@register) - } - } - } -} \ No newline at end of file