diff --git a/build.gradle.kts b/build.gradle.kts index 4d23cad..3ffc0ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,57 +1,83 @@ +@file:Suppress("UnstableApiUsage", "PropertyName") + +import org.polyfrost.gradle.util.noServerRunConfigs import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import cc.polyfrost.gradle.util.noServerRunConfigs +// Adds support for kotlin, and adds the Polyfrost Gradle Toolkit +// which we use to prepare the environment. plugins { - id("cc.polyfrost.multi-version") - id("cc.polyfrost.defaults.repo") - id("cc.polyfrost.defaults.java") - id("cc.polyfrost.defaults.loom") + kotlin("jvm") + id("org.polyfrost.multi-version") + id("org.polyfrost.defaults.repo") + id("org.polyfrost.defaults.java") + id("org.polyfrost.defaults.loom") id("com.github.johnrengelman.shadow") - id("net.kyori.blossom") version "1.3.0" + id("net.kyori.blossom") version "1.3.1" id("signing") java } +// Gets the mod name, version and id from the `gradle.properties` file. val mod_name: String by project val mod_version: String by project val mod_id: String by project +val mod_archives_name: String by project +// Sets up the variables for when we preprocess to other Minecraft versions. preprocess { vars.put("MODERN", if (project.platform.mcMinor >= 16) 1 else 0) } +// Replaces the variables in `ExampleMod.java` to the ones specified in `gradle.properties`. blossom { replaceToken("@VER@", mod_version) replaceToken("@NAME@", mod_name) replaceToken("@ID@", mod_id) } +// Sets the mod version to the one specified in `gradle.properties`. Make sure to change this following semver! version = mod_version -group = "cc.polyfrost" +// Sets the group, make sure to change this to your own. It can be a website you own backwards or your GitHub username. +// e.g. com.github. or com. +group = "org.polyfrost" + +// Sets the name of the output jar (the one you put in your mods folder and send to other people) +// It outputs all versions of the mod into the `build` directory. base { - archivesName.set("$mod_name ($platform)") + archivesName.set("$mod_archives_name-$platform") } + +// Configures the Polyfrost Loom, our plugin fork to easily set up the programming environment. loom { + // Removes the server configs from IntelliJ IDEA, leaving only client runs. + // If you're developing a server-side mod, you can remove this line. noServerRunConfigs() + + // Adds the tweak class if we are building legacy version of forge as per the documentation (https://docs.polyfrost.org) if (project.platform.isLegacyForge) { - launchConfigs.named("client") { - arg("--tweakClass", "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker") - property("mixin.debug.export", "true") + runConfigs { + "client" { + programArgs("--tweakClass", "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker") + property("mixin.debug.export", "true") + } } } + // Configures the mixins if we are building for forge, useful for when we are dealing with cross-platform projects. if (project.platform.isForge) { forge { mixinConfig("mixins.${mod_id}.json") } } - + // Configures the name of the mixin "refmap" using an experimental loom api. mixin.defaultRefmapName.set("mixins.${mod_id}.refmap.json") } +// Creates the shade/shadow configuration, so we can include libraries inside our mod, rather than having to add them separately. val shade: Configuration by configurations.creating { configurations.implementation.get().extendsFrom(this) } +// Configures the output directory for when building from the `src/resources` directory. sourceSets { val dummy by creating main { @@ -60,67 +86,72 @@ sourceSets { } } +// Adds the Polyfrost maven repository so that we can get the libraries necessary to develop the mod. repositories { - maven("https://repo.polyfrost.cc/releases") + maven("https://repo.polyfrost.org/releases") } +// Configures the libraries/dependencies for your mod. dependencies { - modCompileOnly("cc.polyfrost:oneconfig-$platform:0.2.0-alpha+") + // Adds the OneConfig library, so we can develop with it. + modCompileOnly("cc.polyfrost:oneconfig-$platform:0.2.1-alpha+") + + modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.1.2") + // If we are building for legacy forge, includes the launch wrapper with `shade` as we configured earlier. if (platform.isLegacyForge) { compileOnly("org.spongepowered:mixin:0.7.11-SNAPSHOT") shade("cc.polyfrost:oneconfig-wrapper-launchwrapper:1.0.0-beta+") } } -tasks.processResources { - inputs.property("id", mod_id) - inputs.property("name", mod_name) - val java = if (project.platform.mcMinor >= 18) { - 17 - } else { - if (project.platform.mcMinor == 17) 16 else 8 - } - val compatLevel = "JAVA_${java}" - inputs.property("java", java) - inputs.property("java_level", compatLevel) - inputs.property("version", mod_version) - inputs.property("mcVersionStr", project.platform.mcVersionStr) - filesMatching(listOf("mcmod.info", "mixins.${mod_id}.json", "mods.toml")) { - expand( - mapOf( - "id" to mod_id, - "name" to mod_name, - "java" to java, - "java_level" to compatLevel, - "version" to mod_version, - "mcVersionStr" to project.platform.mcVersionStr +tasks { + // Processes the `src/resources/mcmod.info or fabric.mod.json` and replaces + // the mod id, name and version with the ones in `gradle.properties` + processResources { + inputs.property("id", mod_id) + inputs.property("name", mod_name) + val java = if (project.platform.mcMinor >= 18) { + 17 // If we are playing on version 1.18, set the java version to 17 + } else { + // Else if we are playing on version 1.17, use java 16. + if (project.platform.mcMinor == 17) + 16 + else + 8 // For all previous versions, we **need** java 8 (for Forge support). + } + val compatLevel = "JAVA_${java}" + inputs.property("java", java) + inputs.property("java_level", compatLevel) + inputs.property("version", mod_version) + inputs.property("mcVersionStr", project.platform.mcVersionStr) + filesMatching(listOf("mcmod.info", "mixins.${mod_id}.json", "mods.toml")) { + expand( + mapOf( + "id" to mod_id, + "name" to mod_name, + "java" to java, + "java_level" to compatLevel, + "version" to mod_version, + "mcVersionStr" to project.platform.mcVersionStr + ) ) - ) - } - filesMatching("fabric.mod.json") { - expand( - mapOf( - "id" to mod_id, - "name" to mod_name, - "java" to java, - "java_level" to compatLevel, - "version" to mod_version, - "mcVersionStr" to project.platform.mcVersionStr.substringBeforeLast(".") + ".x" + } + filesMatching("fabric.mod.json") { + expand( + mapOf( + "id" to mod_id, + "name" to mod_name, + "java" to java, + "java_level" to compatLevel, + "version" to mod_version, + "mcVersionStr" to project.platform.mcVersionStr.substringBeforeLast(".") + ".x" + ) ) - ) - } -} - -afterEvaluate { - if (rootProject.file("LICENSE-TEMPLATE").exists()) { - logger.error("-------------------------------------------------------") - logger.error("PLEASE REPLACE THE `LICENSE-TEMPLATE` FILE WITH YOUR OWN LICENSE") - logger.error("-------------------------------------------------------") + } } -} -tasks { + // Configures the resources to include if we are building for forge or fabric. withType(Jar::class.java) { if (project.platform.isFabric) { exclude("mcmod.info", "mods.toml") @@ -133,26 +164,30 @@ tasks { } } } + + // Configures our shadow/shade configuration, so we can + // include some dependencies within our mod jar file. named("shadowJar") { - archiveClassifier.set("dev") + archiveClassifier.set("dev") // TODO: machete gets confused by the `dev` prefix. configurations = listOf(shade) - relocate("ofconfig.", "") duplicatesStrategy = DuplicatesStrategy.EXCLUDE + relocate("ofconfig.", "") } + remapJar { - input.set(shadowJar.get().archiveFile) + inputFile.set(shadowJar.get().archiveFile) archiveClassifier.set("") } + jar { - manifest { - attributes( - mapOf( - "ModSide" to "CLIENT", - "ForceLoadAsMod" to true, - "TweakOrder" to "0", - "MixinConfigs" to "mixins.${mod_id}.json", - "TweakClass" to "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker" - ) + // Sets the jar manifest attributes. + if (platform.isLegacyForge) { + manifest.attributes += mapOf( + "ModSide" to "CLIENT", // We aren't developing a server-side mod, so this is fine. + "ForceLoadAsMod" to true, // We want to load this jar as a mod, so we force Forge to do so. + "TweakOrder" to "0", // Makes sure that the OneConfig launch wrapper is loaded as soon as possible. + "MixinConfigs" to "mixins.${mod_id}.json", // We want to use our mixin configuration, so we specify it here. + "TweakClass" to "cc.polyfrost.oneconfig.loader.stage0.LaunchWrapperTweaker" // Loads the OneConfig launch wrapper. ) } dependsOn(shadowJar) diff --git a/gradle.properties b/gradle.properties index b372bd8..978b341 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ mod_name = PolyBlur mod_id = polyblur -mod_version = 1.0.0-beta3 - -polyfrost.defaults.loom=0 +mod_version = 1.0.0 +mod_archives_name=PolyBlur +# Gradle Configuration -- DO NOT TOUCH THESE VALUES. +polyfrost.defaults.loom=1 org.gradle.daemon=true org.gradle.parallel=true org.gradle.configureoncommand=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb70..e411586 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/root.gradle.kts b/root.gradle.kts index ea58f60..6246bdf 100644 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("jvm") version "1.6.21" apply false - id("cc.polyfrost.multi-version.root") + kotlin("jvm") version "1.8.22" apply false + id("org.polyfrost.multi-version.root") id("com.github.johnrengelman.shadow") version "7.1.2" apply false } diff --git a/settings.gradle.kts b/settings.gradle.kts index 16f2900..5c72efc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,21 +1,26 @@ +@file:Suppress("PropertyName") + pluginManagement { repositories { gradlePluginPortal() - maven("https://repo.polyfrost.cc/releases") + mavenCentral() + maven("https://repo.polyfrost.org/releases") // Adds the Polyfrost maven repository to get Polyfrost Gradle Toolkit } plugins { - val egtVersion = "0.1.28" - id("cc.polyfrost.multi-version.root") version egtVersion + val pgtVersion = "0.2.9" // Sets the default versions for Polyfrost Gradle Toolkit + id("org.polyfrost.multi-version.root") version pgtVersion } } val mod_name: String by settings +// Configures the root project Gradle name based on the value in `gradle.properties` rootProject.name = mod_name rootProject.buildFileName = "root.gradle.kts" +// Adds all of our build target versions to the classpath if we need to add version-specific code. listOf( - "1.8.9-forge", + "1.8.9-forge", // Update this if you want to remove/add a version, along with `build.gradle.kts` and `root.gradle.kts`. "1.12.2-forge" ).forEach { version -> include(":$version") diff --git a/src/main/java/cc/polyfrost/polyblur/PolyBlur.java b/src/main/java/org/polyfrost/polyblur/PolyBlur.java similarity index 75% rename from src/main/java/cc/polyfrost/polyblur/PolyBlur.java rename to src/main/java/org/polyfrost/polyblur/PolyBlur.java index ac1e13f..70714f1 100644 --- a/src/main/java/cc/polyfrost/polyblur/PolyBlur.java +++ b/src/main/java/org/polyfrost/polyblur/PolyBlur.java @@ -1,10 +1,10 @@ -package cc.polyfrost.polyblur; +package org.polyfrost.polyblur; import cc.polyfrost.oneconfig.events.EventManager; import cc.polyfrost.oneconfig.utils.commands.CommandManager; -import cc.polyfrost.polyblur.blurs.phosphor.PhosphorBlur; -import cc.polyfrost.polyblur.commands.PolyBlurCommand; -import cc.polyfrost.polyblur.config.PolyBlurConfig; +import org.polyfrost.polyblur.blurs.phosphor.PhosphorBlur; +import org.polyfrost.polyblur.commands.PolyBlurCommand; +import org.polyfrost.polyblur.config.PolyBlurConfig; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.event.FMLInitializationEvent; diff --git a/src/main/java/cc/polyfrost/polyblur/blurs/monkey/MonkeyBlur.java b/src/main/java/org/polyfrost/polyblur/blurs/monkey/MonkeyBlur.java similarity index 97% rename from src/main/java/cc/polyfrost/polyblur/blurs/monkey/MonkeyBlur.java rename to src/main/java/org/polyfrost/polyblur/blurs/monkey/MonkeyBlur.java index 2834f40..1f9c36a 100644 --- a/src/main/java/cc/polyfrost/polyblur/blurs/monkey/MonkeyBlur.java +++ b/src/main/java/org/polyfrost/polyblur/blurs/monkey/MonkeyBlur.java @@ -1,9 +1,9 @@ -package cc.polyfrost.polyblur.blurs.monkey; +package org.polyfrost.polyblur.blurs.monkey; -import cc.polyfrost.polyblur.PolyBlur; -import cc.polyfrost.polyblur.optifine.OFConfig; -import cc.polyfrost.polyblur.shader.Shader; -import cc.polyfrost.polyblur.shader.ShaderLoader; +import org.polyfrost.polyblur.PolyBlur; +import org.polyfrost.polyblur.optifine.OFConfig; +import org.polyfrost.polyblur.shader.Shader; +import org.polyfrost.polyblur.shader.ShaderLoader; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/cc/polyfrost/polyblur/blurs/monkey/MonkeyBuffer.java b/src/main/java/org/polyfrost/polyblur/blurs/monkey/MonkeyBuffer.java similarity index 99% rename from src/main/java/cc/polyfrost/polyblur/blurs/monkey/MonkeyBuffer.java rename to src/main/java/org/polyfrost/polyblur/blurs/monkey/MonkeyBuffer.java index cf9e7cc..60bf6ac 100644 --- a/src/main/java/cc/polyfrost/polyblur/blurs/monkey/MonkeyBuffer.java +++ b/src/main/java/org/polyfrost/polyblur/blurs/monkey/MonkeyBuffer.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.blurs.monkey; +package org.polyfrost.polyblur.blurs.monkey; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/cc/polyfrost/polyblur/blurs/moulberry/MBBlur.java b/src/main/java/org/polyfrost/polyblur/blurs/moulberry/MBBlur.java similarity index 97% rename from src/main/java/cc/polyfrost/polyblur/blurs/moulberry/MBBlur.java rename to src/main/java/org/polyfrost/polyblur/blurs/moulberry/MBBlur.java index 7988bb3..b0d1830 100644 --- a/src/main/java/cc/polyfrost/polyblur/blurs/moulberry/MBBlur.java +++ b/src/main/java/org/polyfrost/polyblur/blurs/moulberry/MBBlur.java @@ -1,6 +1,6 @@ -package cc.polyfrost.polyblur.blurs.moulberry; +package org.polyfrost.polyblur.blurs.moulberry; -import cc.polyfrost.polyblur.PolyBlur; +import org.polyfrost.polyblur.PolyBlur; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/cc/polyfrost/polyblur/blurs/phosphor/EntityRendererHook.java b/src/main/java/org/polyfrost/polyblur/blurs/phosphor/EntityRendererHook.java similarity index 79% rename from src/main/java/cc/polyfrost/polyblur/blurs/phosphor/EntityRendererHook.java rename to src/main/java/org/polyfrost/polyblur/blurs/phosphor/EntityRendererHook.java index d466b1d..40d82c8 100644 --- a/src/main/java/cc/polyfrost/polyblur/blurs/phosphor/EntityRendererHook.java +++ b/src/main/java/org/polyfrost/polyblur/blurs/phosphor/EntityRendererHook.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.blurs.phosphor; +package org.polyfrost.polyblur.blurs.phosphor; import net.minecraft.client.shader.ShaderGroup; diff --git a/src/main/java/cc/polyfrost/polyblur/blurs/phosphor/PhosphorBlur.java b/src/main/java/org/polyfrost/polyblur/blurs/phosphor/PhosphorBlur.java similarity index 96% rename from src/main/java/cc/polyfrost/polyblur/blurs/phosphor/PhosphorBlur.java rename to src/main/java/org/polyfrost/polyblur/blurs/phosphor/PhosphorBlur.java index 410fc04..bfc1ea1 100644 --- a/src/main/java/cc/polyfrost/polyblur/blurs/phosphor/PhosphorBlur.java +++ b/src/main/java/org/polyfrost/polyblur/blurs/phosphor/PhosphorBlur.java @@ -1,12 +1,12 @@ -package cc.polyfrost.polyblur.blurs.phosphor; +package org.polyfrost.polyblur.blurs.phosphor; import cc.polyfrost.oneconfig.events.event.RenderEvent; import cc.polyfrost.oneconfig.events.event.Stage; import cc.polyfrost.oneconfig.libs.eventbus.Subscribe; import cc.polyfrost.oneconfig.libs.universal.UMinecraft; import cc.polyfrost.oneconfig.libs.universal.UResolution; -import cc.polyfrost.polyblur.PolyBlur; -import cc.polyfrost.polyblur.mixin.ShaderGroupAccessor; +import org.polyfrost.polyblur.PolyBlur; +import org.polyfrost.polyblur.mixin.ShaderGroupAccessor; import net.minecraft.client.Minecraft; import net.minecraft.client.shader.Shader; import net.minecraft.client.shader.ShaderGroup; diff --git a/src/main/java/cc/polyfrost/polyblur/commands/PolyBlurCommand.java b/src/main/java/org/polyfrost/polyblur/commands/PolyBlurCommand.java similarity index 77% rename from src/main/java/cc/polyfrost/polyblur/commands/PolyBlurCommand.java rename to src/main/java/org/polyfrost/polyblur/commands/PolyBlurCommand.java index a563cc7..2ea86b3 100644 --- a/src/main/java/cc/polyfrost/polyblur/commands/PolyBlurCommand.java +++ b/src/main/java/org/polyfrost/polyblur/commands/PolyBlurCommand.java @@ -1,8 +1,8 @@ -package cc.polyfrost.polyblur.commands; +package org.polyfrost.polyblur.commands; import cc.polyfrost.oneconfig.utils.commands.annotations.Command; import cc.polyfrost.oneconfig.utils.commands.annotations.Main; -import cc.polyfrost.polyblur.PolyBlur; +import org.polyfrost.polyblur.PolyBlur; @Command("polyblur") public class PolyBlurCommand { diff --git a/src/main/java/cc/polyfrost/polyblur/config/PolyBlurConfig.java b/src/main/java/org/polyfrost/polyblur/config/PolyBlurConfig.java similarity index 94% rename from src/main/java/cc/polyfrost/polyblur/config/PolyBlurConfig.java rename to src/main/java/org/polyfrost/polyblur/config/PolyBlurConfig.java index 53d5f4d..36c2387 100644 --- a/src/main/java/cc/polyfrost/polyblur/config/PolyBlurConfig.java +++ b/src/main/java/org/polyfrost/polyblur/config/PolyBlurConfig.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.config; +package org.polyfrost.polyblur.config; import cc.polyfrost.oneconfig.config.Config; import cc.polyfrost.oneconfig.config.annotations.Dropdown; @@ -8,7 +8,7 @@ import cc.polyfrost.oneconfig.config.data.InfoType; import cc.polyfrost.oneconfig.config.data.Mod; import cc.polyfrost.oneconfig.config.data.ModType; -import cc.polyfrost.polyblur.blurs.phosphor.PhosphorBlur; +import org.polyfrost.polyblur.blurs.phosphor.PhosphorBlur; public class PolyBlurConfig extends Config { diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/BlurHandlerImplMixin.java b/src/main/java/org/polyfrost/polyblur/mixin/BlurHandlerImplMixin.java similarity index 93% rename from src/main/java/cc/polyfrost/polyblur/mixin/BlurHandlerImplMixin.java rename to src/main/java/org/polyfrost/polyblur/mixin/BlurHandlerImplMixin.java index 68ec74a..168b5eb 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/BlurHandlerImplMixin.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/BlurHandlerImplMixin.java @@ -1,8 +1,8 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; import cc.polyfrost.oneconfig.internal.gui.impl.BlurHandlerImpl; import cc.polyfrost.oneconfig.libs.universal.UMinecraft; -import cc.polyfrost.polyblur.blurs.phosphor.EntityRendererHook; +import org.polyfrost.polyblur.blurs.phosphor.EntityRendererHook; import org.spongepowered.asm.mixin.Dynamic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/BlurModMixin.java b/src/main/java/org/polyfrost/polyblur/mixin/BlurModMixin.java similarity index 92% rename from src/main/java/cc/polyfrost/polyblur/mixin/BlurModMixin.java rename to src/main/java/org/polyfrost/polyblur/mixin/BlurModMixin.java index 0f92f0c..df26203 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/BlurModMixin.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/BlurModMixin.java @@ -1,7 +1,7 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; import cc.polyfrost.oneconfig.libs.universal.UMinecraft; -import cc.polyfrost.polyblur.blurs.phosphor.EntityRendererHook; +import org.polyfrost.polyblur.blurs.phosphor.EntityRendererHook; import net.minecraft.client.renderer.EntityRenderer; import org.spongepowered.asm.mixin.Dynamic; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/EntityRendererMixin.java b/src/main/java/org/polyfrost/polyblur/mixin/EntityRendererMixin.java similarity index 90% rename from src/main/java/cc/polyfrost/polyblur/mixin/EntityRendererMixin.java rename to src/main/java/org/polyfrost/polyblur/mixin/EntityRendererMixin.java index 5a78e20..528efa0 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/EntityRendererMixin.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/EntityRendererMixin.java @@ -1,7 +1,7 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; -import cc.polyfrost.polyblur.blurs.monkey.MonkeyBlur; -import cc.polyfrost.polyblur.blurs.moulberry.MBBlur; +import org.polyfrost.polyblur.blurs.monkey.MonkeyBlur; +import org.polyfrost.polyblur.blurs.moulberry.MBBlur; import net.minecraft.client.renderer.EntityRenderer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/EntityRendererMixin_PhosphorBlur.java b/src/main/java/org/polyfrost/polyblur/mixin/EntityRendererMixin_PhosphorBlur.java similarity index 96% rename from src/main/java/cc/polyfrost/polyblur/mixin/EntityRendererMixin_PhosphorBlur.java rename to src/main/java/org/polyfrost/polyblur/mixin/EntityRendererMixin_PhosphorBlur.java index f542b8d..8b07326 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/EntityRendererMixin_PhosphorBlur.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/EntityRendererMixin_PhosphorBlur.java @@ -1,6 +1,6 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; -import cc.polyfrost.polyblur.blurs.phosphor.EntityRendererHook; +import org.polyfrost.polyblur.blurs.phosphor.EntityRendererHook; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/MinecraftMixin.java b/src/main/java/org/polyfrost/polyblur/mixin/MinecraftMixin.java similarity index 83% rename from src/main/java/cc/polyfrost/polyblur/mixin/MinecraftMixin.java rename to src/main/java/org/polyfrost/polyblur/mixin/MinecraftMixin.java index d4a1c1a..f4e197a 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/MinecraftMixin.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/MinecraftMixin.java @@ -1,6 +1,6 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; -import cc.polyfrost.polyblur.blurs.monkey.MonkeyBlur; +import org.polyfrost.polyblur.blurs.monkey.MonkeyBlur; import net.minecraft.client.Minecraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/OptifineConfigMixin.java b/src/main/java/org/polyfrost/polyblur/mixin/OptifineConfigMixin.java similarity index 92% rename from src/main/java/cc/polyfrost/polyblur/mixin/OptifineConfigMixin.java rename to src/main/java/org/polyfrost/polyblur/mixin/OptifineConfigMixin.java index 2a84b46..6d27eb2 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/OptifineConfigMixin.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/OptifineConfigMixin.java @@ -1,6 +1,6 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; -import cc.polyfrost.polyblur.PolyBlur; +import org.polyfrost.polyblur.PolyBlur; import org.spongepowered.asm.mixin.Dynamic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Pseudo; diff --git a/src/main/java/cc/polyfrost/polyblur/mixin/ShaderGroupAccessor.java b/src/main/java/org/polyfrost/polyblur/mixin/ShaderGroupAccessor.java similarity index 89% rename from src/main/java/cc/polyfrost/polyblur/mixin/ShaderGroupAccessor.java rename to src/main/java/org/polyfrost/polyblur/mixin/ShaderGroupAccessor.java index b4e56a6..81b9199 100644 --- a/src/main/java/cc/polyfrost/polyblur/mixin/ShaderGroupAccessor.java +++ b/src/main/java/org/polyfrost/polyblur/mixin/ShaderGroupAccessor.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.mixin; +package org.polyfrost.polyblur.mixin; import net.minecraft.client.shader.Shader; import net.minecraft.client.shader.ShaderGroup; diff --git a/src/main/java/cc/polyfrost/polyblur/optifine/OFConfig.java b/src/main/java/org/polyfrost/polyblur/optifine/OFConfig.java similarity index 92% rename from src/main/java/cc/polyfrost/polyblur/optifine/OFConfig.java rename to src/main/java/org/polyfrost/polyblur/optifine/OFConfig.java index d5860ab..910bbf9 100644 --- a/src/main/java/cc/polyfrost/polyblur/optifine/OFConfig.java +++ b/src/main/java/org/polyfrost/polyblur/optifine/OFConfig.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.optifine; +package org.polyfrost.polyblur.optifine; import ofconfig.Config; diff --git a/src/main/java/cc/polyfrost/polyblur/shader/Shader.java b/src/main/java/org/polyfrost/polyblur/shader/Shader.java similarity index 97% rename from src/main/java/cc/polyfrost/polyblur/shader/Shader.java rename to src/main/java/org/polyfrost/polyblur/shader/Shader.java index 03c0a81..84b9832 100644 --- a/src/main/java/cc/polyfrost/polyblur/shader/Shader.java +++ b/src/main/java/org/polyfrost/polyblur/shader/Shader.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.shader; +package org.polyfrost.polyblur.shader; import org.lwjgl.opengl.GL20; diff --git a/src/main/java/cc/polyfrost/polyblur/shader/ShaderLoader.java b/src/main/java/org/polyfrost/polyblur/shader/ShaderLoader.java similarity index 98% rename from src/main/java/cc/polyfrost/polyblur/shader/ShaderLoader.java rename to src/main/java/org/polyfrost/polyblur/shader/ShaderLoader.java index 7ed2d29..e6dc2ca 100644 --- a/src/main/java/cc/polyfrost/polyblur/shader/ShaderLoader.java +++ b/src/main/java/org/polyfrost/polyblur/shader/ShaderLoader.java @@ -1,4 +1,4 @@ -package cc.polyfrost.polyblur.shader; +package org.polyfrost.polyblur.shader; import net.minecraft.client.Minecraft; import net.minecraft.util.ResourceLocation; diff --git a/src/main/resources/mixins.polyblur.json b/src/main/resources/mixins.polyblur.json index ecfeeae..e44e7d3 100644 --- a/src/main/resources/mixins.polyblur.json +++ b/src/main/resources/mixins.polyblur.json @@ -1,7 +1,7 @@ { "compatibilityLevel": "${java_level}", "minVersion": "0.7", - "package": "cc.polyfrost.polyblur.mixin", + "package": "org.polyfrost.polyblur.mixin", "refmap": "mixins.${id}.refmap.json", "injectors": { "maxShiftBy": 5