mirror of
https://github.com/Motschen/Blur.git
synced 2025-12-13 10:25:09 +01:00
Compare commits
143 Commits
1.0.6-1.16
...
fa6fd82e4d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fa6fd82e4d | ||
|
|
528958fa8c | ||
|
|
552f1e619e | ||
|
|
c9c630ac11 | ||
|
|
695fa67270 | ||
|
|
5f9738da38 | ||
|
|
881709c165 | ||
|
|
50ed77006d | ||
|
|
e99572eb4d | ||
|
|
f7465ee08e | ||
|
|
75bfeb2ce3 | ||
|
|
e5c2a542f4 | ||
|
|
a13cdd11a7 | ||
|
|
6f10a7f3df | ||
|
|
d79dfc004b | ||
|
|
2961637df0 | ||
|
|
8817e18a55 | ||
|
|
f68048d955 | ||
|
|
b6266b8e48 | ||
|
|
d78520448c | ||
|
|
83f2281cb0 | ||
|
|
081b0076c8 | ||
|
|
5afd31651a | ||
|
|
5f0d65e84c | ||
|
|
0799437138 | ||
|
|
fd2e4da3a7 | ||
|
|
4c5e56ae80 | ||
|
|
0449c77fe4 | ||
|
|
0893d6ef6c | ||
|
|
7c89dee562 | ||
|
|
22af1ef118 | ||
|
|
853f137d0c | ||
|
|
b09180a812 | ||
|
|
22037bd37d | ||
|
|
43d2b02162 | ||
|
|
c5f81c7eb1 | ||
|
|
210759cf6f | ||
|
|
266a37da20 | ||
|
|
ef583e6ace | ||
|
|
6ee97e7415 | ||
|
|
36514d5901 | ||
|
|
7ed281b2f9 | ||
|
|
b240c303c3 | ||
|
|
a092873127 | ||
|
|
f9a54f936d | ||
|
|
bd3b58adcb | ||
|
|
d8b6a14e7f | ||
|
|
d726e20410 | ||
|
|
b4efd59322 | ||
|
|
98b398ab6c | ||
|
|
66e0c0408a | ||
|
|
11dde13801 | ||
|
|
3ea75d519c | ||
|
|
ab80391b29 | ||
|
|
a51b02aa04 | ||
|
|
766f30b466 | ||
|
|
77badf3494 | ||
|
|
c868cf1ef7 | ||
|
|
876c5256ae | ||
|
|
0f279a0f91 | ||
|
|
d58cd66cc8 | ||
|
|
44ae96ef50 | ||
|
|
427d453f79 | ||
|
|
521cc15306 | ||
|
|
3528305c93 | ||
|
|
2ad42cf1e9 | ||
|
|
84cc94fba4 | ||
|
|
e139a2319e | ||
|
|
0d90cac688 | ||
|
|
2fb8f29fee | ||
|
|
f69af4c800 | ||
|
|
dc94bd3f5a | ||
|
|
7dd93da833 | ||
|
|
7258cefb5d | ||
|
|
dc7e5bb1e0 | ||
|
|
d42545570e | ||
|
|
9854e97996 | ||
|
|
7b253f50c1 | ||
|
|
8a1824c906 | ||
|
|
f958e43bd1 | ||
|
|
7ab190d697 | ||
|
|
2dc68068e2 | ||
|
|
35635ad633 | ||
|
|
9c4f753fcf | ||
|
|
13d6398de0 | ||
|
|
8e0da73778 | ||
|
|
e668f3fa60 | ||
|
|
6000ba8f64 | ||
|
|
e85231757a | ||
|
|
eca592b646 | ||
|
|
000315bf13 | ||
|
|
fe7229c518 | ||
|
|
b944975c9a | ||
|
|
747188d023 | ||
|
|
a199313682 | ||
|
|
fadf94d9be | ||
|
|
1260881f41 | ||
|
|
08bc0d9512 | ||
|
|
f792d34295 | ||
|
|
895448b13d | ||
|
|
e749f18484 | ||
|
|
91be4094d3 | ||
|
|
55ad971584 | ||
|
|
0ae5c7569d | ||
|
|
0eb076fb40 | ||
|
|
79814b4395 | ||
|
|
3800b44eb3 | ||
|
|
b6e54fddfa | ||
|
|
9feb8a42bd | ||
|
|
3b9fa30b11 | ||
|
|
6667f7564f | ||
|
|
b77190c602 | ||
|
|
994a975c6c | ||
|
|
e1346d2516 | ||
|
|
a520948fff | ||
|
|
40d63109f3 | ||
|
|
a6b70f1c6a | ||
|
|
d42905746b | ||
|
|
432934b056 | ||
|
|
f8a4dd71fd | ||
|
|
d117c98de2 | ||
|
|
fd84d68897 | ||
|
|
7e8194a529 | ||
|
|
28a8530c52 | ||
|
|
cb98527f94 | ||
|
|
3cf6a03361 | ||
|
|
d1d9468482 | ||
|
|
a7c8ff7526 | ||
|
|
c4e1d33ade | ||
|
|
fd386e7585 | ||
|
|
978380b6fd | ||
|
|
e983ab5dee | ||
|
|
19085b6496 | ||
|
|
a6d95dbb45 | ||
|
|
7ee13a4435 | ||
|
|
4dc9e52793 | ||
|
|
f28de240fe | ||
|
|
0450c9238a | ||
|
|
65d9375bfe | ||
|
|
3bffe56f39 | ||
|
|
12c5daa5f6 | ||
|
|
20fdff17ff | ||
|
|
a75f9f8570 |
29
.github/workflows/gradle.yml
vendored
Normal file
29
.github/workflows/gradle.yml
vendored
Normal file
@@ -0,0 +1,29 @@
|
||||
on:
|
||||
push:
|
||||
branches: [ "fabric-1.20.4" ]
|
||||
pull_request:
|
||||
branches: [ "fabric-1.20.4" ]
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v3
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
- name: Grant execute permission for gradlew
|
||||
run: chmod +x gradlew
|
||||
- name: Build with Gradle
|
||||
run: ./gradlew build --stacktrace --info
|
||||
- name: Upload a Build Artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: Blur-Artifact
|
||||
path: build/libs/blur-*.*.jar
|
||||
if-no-files-found: error
|
||||
47
.gitignore
vendored
47
.gitignore
vendored
@@ -1,29 +1,20 @@
|
||||
/download
|
||||
/eclipseBin
|
||||
build/
|
||||
*.ipr
|
||||
run/
|
||||
*.iws
|
||||
out/
|
||||
*.iml
|
||||
.gradle/
|
||||
output/
|
||||
bin/
|
||||
libs/
|
||||
|
||||
## gradle
|
||||
/.gradle
|
||||
/build
|
||||
|
||||
## ForgeGradle
|
||||
/run
|
||||
/*.launch
|
||||
|
||||
## eclipse
|
||||
/eclipse
|
||||
/.settings
|
||||
/.metadata
|
||||
/.classpath
|
||||
/.project
|
||||
/bin
|
||||
|
||||
## intellij
|
||||
/out
|
||||
/.idea
|
||||
/*.iml
|
||||
/*.ipr
|
||||
/*.iws
|
||||
/atlassian-ide-plugin.xml
|
||||
|
||||
## gedit
|
||||
*~
|
||||
.classpath
|
||||
.project
|
||||
.idea/
|
||||
classes/
|
||||
.metadata
|
||||
.vscode
|
||||
.settings
|
||||
*.launch
|
||||
.architectury-transformer/debug.log
|
||||
|
||||
7
README.md
Normal file
7
README.md
Normal file
@@ -0,0 +1,7 @@
|
||||
Ever thought that the world behind your inventory was just too distracting?
|
||||
Or that the default Minecraft blur effect is just too boring?
|
||||
Then this mod is just right for you!
|
||||
|
||||

|
||||
|
||||
Download now on [Modrinth](https://modrinth.com/mod/blur-plus)
|
||||
179
build.gradle
Normal file → Executable file
179
build.gradle
Normal file → Executable file
@@ -1,126 +1,73 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url = "http://files.minecraftforge.net/maven" }
|
||||
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
|
||||
}
|
||||
dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' }
|
||||
}
|
||||
plugins {
|
||||
id 'com.matthewprenger.cursegradle' version '1.0.9'
|
||||
}
|
||||
|
||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||
|
||||
boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equals('false');
|
||||
ext.buildnumber = System.getenv().BUILD_NUMBER ?: 'custom';
|
||||
|
||||
group = 'com.tterrag.blur'
|
||||
archivesBaseName = "Blur"
|
||||
version = "${mod_version}-${buildnumber}"
|
||||
|
||||
sourceCompatibility = '1.8'
|
||||
targetCompatibility = '1.8'
|
||||
|
||||
minecraft {
|
||||
version = "${minecraft_version}-${forge_version}"
|
||||
mappings = 'stable_29'
|
||||
|
||||
runDir = 'run'
|
||||
|
||||
clientJvmArgs += '-Dfml.coreMods.load=com.tterrag.blur.BlurPlugin'
|
||||
|
||||
replace "@VERSION@", project.version
|
||||
}
|
||||
|
||||
processResources {
|
||||
inputs.property "version", project.version
|
||||
inputs.property "mcversion", project.minecraft.version
|
||||
|
||||
// replace stuff in mcmod.info, nothing else
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
include '**/*.info'
|
||||
include '**/*.properties'
|
||||
|
||||
// replace version and mcversion
|
||||
expand 'version': project.version, 'mcversion': project.minecraft.version
|
||||
}
|
||||
|
||||
// copy everything else, thats not the mcmod.info
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
exclude '**/*.info'
|
||||
exclude '**/*.properties'
|
||||
}
|
||||
}
|
||||
|
||||
jar.manifest {
|
||||
attributes 'FMLCorePlugin': 'com.tterrag.blur.BlurPlugin'
|
||||
attributes 'FMLCorePluginContainsFMLMod': 'true'
|
||||
}
|
||||
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
import groovy.json.JsonSlurper
|
||||
import groovy.json.JsonOutput
|
||||
|
||||
task createResourcePacks {
|
||||
def inputFile = new File("resource_packs.json")
|
||||
def json = new JsonSlurper().parseText(inputFile.text)
|
||||
json.each {
|
||||
def pack_id = it.key
|
||||
def pack_name = it.value.name
|
||||
def pack_desc = it.value.description
|
||||
def pack_radius = it.value.radius
|
||||
|
||||
def taskName = "createPack" + pack_id.capitalize();
|
||||
task "${taskName}" (type: Zip) {
|
||||
from ('pack_template') {
|
||||
filter(ReplaceTokens, tokens: [
|
||||
mod_version: project.version.toString(),
|
||||
pack_version: '3',
|
||||
description: pack_desc.toString(),
|
||||
radius: pack_radius.toString()
|
||||
])
|
||||
|
||||
rename(/(.+)\.template/, '$1')
|
||||
}
|
||||
|
||||
from ('pack_icons') {
|
||||
include "${pack_id}.png"
|
||||
rename '.+', 'pack.png'
|
||||
}
|
||||
|
||||
baseName = "Blur " + pack_name
|
||||
plugins {
|
||||
id "architectury-plugin" version "3.4-SNAPSHOT"
|
||||
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
|
||||
id "me.shedaniel.unified-publishing" version "0.1.+" apply false
|
||||
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
|
||||
}
|
||||
|
||||
architectury {
|
||||
minecraft = rootProject.minecraft_version
|
||||
}
|
||||
|
||||
subprojects {
|
||||
apply plugin: "dev.architectury.loom"
|
||||
repositories {
|
||||
maven {
|
||||
url = "https://api.modrinth.com/maven"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
|
||||
// The following line declares the yarn mappings you may select this one as well.
|
||||
mappings loom.layered {
|
||||
it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
|
||||
it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
|
||||
}
|
||||
|
||||
createResourcePacks.finalizedBy taskName
|
||||
}
|
||||
}
|
||||
|
||||
// Not necessary atm
|
||||
// tasks.build.dependsOn createResourcePacks
|
||||
allprojects {
|
||||
apply plugin: "java"
|
||||
apply plugin: "architectury-plugin"
|
||||
apply plugin: "maven-publish"
|
||||
|
||||
tasks.curseforge.enabled = !dev && project.hasProperty('curseforge_key')
|
||||
archivesBaseName = rootProject.archives_base_name
|
||||
version = rootProject.mod_version
|
||||
group = rootProject.maven_group
|
||||
|
||||
curseforge {
|
||||
if (project.hasProperty('curseforge_key')) {
|
||||
apiKey = project.curseforge_key
|
||||
}
|
||||
tasks.withType(JavaCompile) {
|
||||
options.encoding = "UTF-8"
|
||||
options.release = 21
|
||||
}
|
||||
ext {
|
||||
releaseChangelog = {
|
||||
def changes = new StringBuilder()
|
||||
changes << "## Blur+ v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/Motschen/Blur/commits/)"
|
||||
def proc = "git log --max-count=1 --pretty=format:%s".execute()
|
||||
proc.in.eachLine { line ->
|
||||
def processedLine = line.toString()
|
||||
if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) {
|
||||
changes << "\n- ${processedLine.capitalize()}"
|
||||
}
|
||||
}
|
||||
proc.waitFor()
|
||||
return changes.toString()
|
||||
}
|
||||
}
|
||||
processResources {
|
||||
// Minify json resources
|
||||
doLast {
|
||||
fileTree(dir: outputs.files.asPath, include: "**/*.json").each {
|
||||
File file -> file.text = JsonOutput.toJson(new JsonSlurper().parse(file))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
project {
|
||||
id = project.project_id
|
||||
changelogType = 'html'
|
||||
changelog = System.getenv('CHANGELOG')
|
||||
if (changelog == null || 'none'.equals(changelog)) {
|
||||
changelog = getChangelog() ?: ''
|
||||
changelogType = 'text'
|
||||
}
|
||||
releaseType = project.release_type
|
||||
addGameVersion '1.9.4'
|
||||
addGameVersion '1.11.2'
|
||||
addGameVersion '1.12'
|
||||
addGameVersion '1.12.1'
|
||||
mainArtifact(jar) {
|
||||
displayName = "Blur ${mod_version}"
|
||||
}
|
||||
}
|
||||
java {
|
||||
withSourcesJar()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
24
common/build.gradle
Normal file
24
common/build.gradle
Normal file
@@ -0,0 +1,24 @@
|
||||
architectury {
|
||||
common(rootProject.enabled_platforms.split(","))
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
|
||||
// Do NOT use other classes from fabric loader
|
||||
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
||||
modCompileOnly "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric"
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
mavenCommon(MavenPublication) {
|
||||
artifactId = rootProject.archives_base_name
|
||||
from components.java
|
||||
}
|
||||
}
|
||||
|
||||
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
|
||||
repositories {
|
||||
// Add repositories to publish to here.
|
||||
}
|
||||
}
|
||||
103
common/src/main/java/eu/midnightdust/blur/Blur.java
Normal file
103
common/src/main/java/eu/midnightdust/blur/Blur.java
Normal file
@@ -0,0 +1,103 @@
|
||||
package eu.midnightdust.blur;
|
||||
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
import eu.midnightdust.blur.util.RainbowColor;
|
||||
import eu.midnightdust.lib.util.MidnightColorUtil;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import org.joml.Math;
|
||||
import org.joml.Matrix4f;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.lang.Double;
|
||||
|
||||
import static eu.midnightdust.blur.BlurInfo.*;
|
||||
import static eu.midnightdust.blur.util.RainbowColor.hue;
|
||||
import static eu.midnightdust.blur.util.RainbowColor.hue2;
|
||||
|
||||
public class Blur {
|
||||
public static final String MOD_ID = "blur";
|
||||
public static void init() {
|
||||
BlurConfig.init(MOD_ID, BlurConfig.class);
|
||||
}
|
||||
|
||||
public static boolean doFade = false;
|
||||
|
||||
public static void onRender() {
|
||||
if (!BlurInfo.doTest && BlurInfo.screenChanged) { // After the tests for blur and background color have been completed
|
||||
Blur.onScreenChange();
|
||||
BlurInfo.screenChanged = false;
|
||||
}
|
||||
BlurInfo.doTest = false; // Set the test state to completed, as tests will happen in the same tick.
|
||||
}
|
||||
public static void renderFadeout(DrawContext context, int width, int height, MinecraftClient client) {
|
||||
if (BlurInfo.start >= 0 && !BlurInfo.screenHasBlur && BlurInfo.prevScreenHasBlur) { // Fade out in non-blurred screens
|
||||
client.gameRenderer.renderBlur();
|
||||
|
||||
if (BlurInfo.prevScreenHasBackground && BlurConfig.useGradient) Blur.renderRotatedGradient(context, width, height);
|
||||
}
|
||||
}
|
||||
|
||||
public static void onScreenChange() {
|
||||
if (screenHasBlur) {
|
||||
if (doFade) {
|
||||
start = System.currentTimeMillis();
|
||||
doFade = false;
|
||||
}
|
||||
} else if (prevScreenHasBlur && BlurConfig.fadeOutTimeMillis > 0) {
|
||||
start = System.currentTimeMillis();
|
||||
doFade = true;
|
||||
} else {
|
||||
start = -1;
|
||||
doFade = true;
|
||||
}
|
||||
}
|
||||
|
||||
public static void updateProgress(boolean fadeIn) {
|
||||
double x;
|
||||
if (fadeIn) {
|
||||
x = Math.min((System.currentTimeMillis() - start) / (double) BlurConfig.fadeTimeMillis, 1);
|
||||
}
|
||||
else {
|
||||
x = Math.max(1 + (start - System.currentTimeMillis()) / (double) BlurConfig.fadeOutTimeMillis, 0);
|
||||
if (x <= 0) {
|
||||
start = -1;
|
||||
}
|
||||
}
|
||||
x = BlurConfig.animationCurve.apply(x, fadeIn);
|
||||
x = Math.clamp(0, 1, x);
|
||||
|
||||
progress = Double.valueOf(x).floatValue();
|
||||
}
|
||||
|
||||
public static int getBackgroundColor(boolean second) {
|
||||
int a = second ? BlurConfig.gradientEndAlpha : BlurConfig.gradientStartAlpha;
|
||||
var col = MidnightColorUtil.hex2Rgb(second ? BlurConfig.gradientEnd : BlurConfig.gradientStart);
|
||||
if (BlurConfig.rainbowMode) col = second ? Color.getHSBColor(hue, 1, 1) : Color.getHSBColor(hue2, 1, 1);
|
||||
int r = (col.getRGB() >> 16) & 0xFF;
|
||||
int b = (col.getRGB() >> 8) & 0xFF;
|
||||
int g = col.getRGB() & 0xFF;
|
||||
float prog = progress;
|
||||
a = (int) (prog * a);
|
||||
r = (int) (prog * r);
|
||||
g = (int) (prog * g);
|
||||
b = (int) (prog * b);
|
||||
return a << 24 | r << 16 | b << 8 | g;
|
||||
}
|
||||
public static int getRotation() {
|
||||
if (BlurConfig.rainbowMode) return RainbowColor.rotation;
|
||||
return BlurConfig.gradientRotation;
|
||||
}
|
||||
public static void renderRotatedGradient(DrawContext context, int width, int height) {
|
||||
float diagonal = Math.sqrt((float) width*width + height*height);
|
||||
int smallestDimension = Math.min(width, height);
|
||||
|
||||
context.getMatrices().push();
|
||||
Matrix4f posMatrix = context.getMatrices().peek().getPositionMatrix();
|
||||
posMatrix.rotationZ(Math.toRadians(getRotation()));
|
||||
posMatrix.setTranslation(width / 2f, height / 2f, -1000); // Make the gradient's center the pivot point
|
||||
posMatrix.scale(diagonal / smallestDimension); // Scales the gradient to the maximum diagonal value needed
|
||||
context.fillGradient(-width / 2, -height / 2, width / 2, height / 2, Blur.getBackgroundColor(false), Blur.getBackgroundColor(true)); // Actually draw the gradient
|
||||
context.getMatrices().pop();
|
||||
}
|
||||
}
|
||||
32
common/src/main/java/eu/midnightdust/blur/BlurInfo.java
Normal file
32
common/src/main/java/eu/midnightdust/blur/BlurInfo.java
Normal file
@@ -0,0 +1,32 @@
|
||||
package eu.midnightdust.blur;
|
||||
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
public class BlurInfo {
|
||||
public static long start;
|
||||
public static float progress;
|
||||
|
||||
public static boolean prevScreenHasBlur;
|
||||
public static boolean screenHasBlur;
|
||||
|
||||
public static boolean prevScreenHasBackground;
|
||||
public static boolean screenHasBackground;
|
||||
|
||||
public static boolean doTest = true;
|
||||
public static boolean screenChanged = true;
|
||||
public static long lastScreenChange = System.currentTimeMillis();
|
||||
|
||||
public static void reset(Screen newScreen) {
|
||||
// Here, we reset all tests, to check if the new screen has blur and/or a background
|
||||
if (newScreen != null && BlurConfig.excludedScreens.contains(newScreen.getClass().getCanonicalName())) return;
|
||||
prevScreenHasBlur = screenHasBlur;
|
||||
prevScreenHasBackground = screenHasBackground;
|
||||
screenHasBlur = false;
|
||||
screenHasBackground = false;
|
||||
doTest = true;
|
||||
screenChanged = true;
|
||||
start = -1;
|
||||
lastScreenChange = System.currentTimeMillis();
|
||||
}
|
||||
}
|
||||
105
common/src/main/java/eu/midnightdust/blur/config/BlurConfig.java
Normal file
105
common/src/main/java/eu/midnightdust/blur/config/BlurConfig.java
Normal file
@@ -0,0 +1,105 @@
|
||||
package eu.midnightdust.blur.config;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.function.Function;
|
||||
|
||||
import static java.lang.Math.*;
|
||||
|
||||
public class BlurConfig extends MidnightConfig {
|
||||
public static final String ANIMATIONS = "animations";
|
||||
public static final String STYLE = "style";
|
||||
public static final String SCREENS = "screens";
|
||||
@Entry @Hidden public static int configVersion = 2;
|
||||
|
||||
@Comment(category = SCREENS, centered = true)
|
||||
public static Comment _general;
|
||||
@Entry(category = SCREENS)
|
||||
public static boolean blurContainers = true;
|
||||
@Entry(category = SCREENS)
|
||||
public static boolean blurTitleScreen = false;
|
||||
@Condition(requiredOption = "blurTitleScreen", visibleButLocked = true)
|
||||
@Entry(category = SCREENS)
|
||||
public static boolean darkenTitleScreen = false;
|
||||
@Comment(category = SCREENS, centered = true)
|
||||
public static Comment _advanced;
|
||||
@Entry(category = SCREENS) // Screens where Blur+ should not apply transition effects (mostly dynamically blurred screens)
|
||||
public static List<String> excludedScreens = Lists.newArrayList("net.irisshaders.iris.gui.screen.ShaderPackScreen");
|
||||
@Entry(category = SCREENS) // Screens where the vanilla blur effect should be force enabled
|
||||
public static List<String> forceEnabledScreens = Lists.newArrayList("dev.emi.emi.screen.RecipeScreen");
|
||||
@Entry(category = SCREENS) // Screens where the vanilla blur effect should be force disabled
|
||||
public static List<String> forceDisabledScreens = Lists.newArrayList();
|
||||
|
||||
@Comment(category = STYLE, centered = true)
|
||||
public static Comment _blur;
|
||||
@Entry(category = STYLE, isSlider = true, min = 0, max = 20)
|
||||
public static int radius = 5;
|
||||
@Comment(category = STYLE, centered = true)
|
||||
public static Comment _gradient;
|
||||
@Entry(category = STYLE)
|
||||
public static boolean useGradient = true;
|
||||
@Condition(requiredOption = "useGradient", visibleButLocked = true)
|
||||
@Entry(category = STYLE, isColor = true, width = 7, min = 7)
|
||||
public static String gradientStart = "#000000";
|
||||
@Condition(requiredOption = "useGradient", visibleButLocked = true)
|
||||
@Entry(category = STYLE, isSlider = true, min = 0, max = 255)
|
||||
public static int gradientStartAlpha = 75;
|
||||
@Condition(requiredOption = "useGradient", visibleButLocked = true)
|
||||
@Entry(category = STYLE, isColor = true, width = 7, min = 7)
|
||||
public static String gradientEnd = "#000000";
|
||||
@Condition(requiredOption = "useGradient", visibleButLocked = true)
|
||||
@Entry(category = STYLE, isSlider = true, min = 0, max = 255)
|
||||
public static int gradientEndAlpha = 75;
|
||||
@Condition(requiredOption = "useGradient", visibleButLocked = true)
|
||||
@Entry(category = STYLE, isSlider = true, min = 0, max = 360)
|
||||
public static int gradientRotation = 0;
|
||||
@Entry(category = STYLE)
|
||||
public static boolean rainbowMode = false;
|
||||
|
||||
@Comment(category = ANIMATIONS, centered = true)
|
||||
public static Comment _animations;
|
||||
@Entry(category = ANIMATIONS, min = 0, max = 2000, isSlider = true)
|
||||
public static int fadeTimeMillis = 300;
|
||||
@Entry(category = ANIMATIONS, min = 0, max = 2000, isSlider = true)
|
||||
public static int fadeOutTimeMillis = 300;
|
||||
@Entry(category = ANIMATIONS)
|
||||
public static BlurConfig.Easing animationCurve = Easing.FLAT;
|
||||
|
||||
@Override
|
||||
public void writeChanges(String modid) {
|
||||
super.writeChanges(modid);
|
||||
if (MinecraftClient.getInstance().options != null)
|
||||
MinecraftClient.getInstance().options.getMenuBackgroundBlurriness().setValue(radius);
|
||||
}
|
||||
|
||||
public enum Easing {
|
||||
// Based on https://gist.github.com/dev-hydrogen/21a66f83f0386123e0c0acf107254843
|
||||
// Thank you very much!
|
||||
|
||||
FLAT(x -> x, x -> x),
|
||||
SINE(x -> 1 - cos(x * PI) / 2, x -> sin(x * PI) / 2),
|
||||
QUAD(x -> x * x, x -> 1 - (1 - x) * (1 - x)),
|
||||
CUBIC(x -> x * x * x, x -> 1 - pow(1 - x, 3)),
|
||||
QUART(x -> x * x * x * x, x -> 1 - pow(1 - x, 4)),
|
||||
QUINT(x -> x * x * x * x * x, x -> 1 - pow(1 - x, 5)),
|
||||
EXPO(x -> x == 0 ? 0 : pow(2, 10 * x - 10), x -> x == 1 ? 1 : 1 - pow(2, -10 * x)),
|
||||
CIRC(x -> 1 - sqrt(1 - pow(x, 2)), x -> sqrt(1 - pow(x - 1, 2))),
|
||||
BACK(x -> 2.70158 * x * x * x - 1.70158 * x * x,x -> 1 + 2.70158 * pow(x - 1, 3) + 1.70158 * pow(x - 1, 2)),
|
||||
ELASTIC(x -> x == 0 ? 0 : x == 1 ? 1 : -pow(2, 10 * x - 10) * sin((x * 10 - 10.75) * ((2 * PI) / 3)), x -> x == 0 ? 0 : x == 1 ? 1 : pow(2, -10 * x) * sin((x * 10 - 0.75) * ((2 * PI) / 3)) + 1);
|
||||
|
||||
final Function<Double, Number> functionIn;
|
||||
final Function<Double, Number> functionOut;
|
||||
|
||||
Easing(Function<Double, Number> functionIn, Function<Double, Number> functionOut) {
|
||||
this.functionIn = functionIn;
|
||||
this.functionOut = functionOut;
|
||||
}
|
||||
public Double apply(Double x, boolean in) {
|
||||
if (in) return functionIn.apply(x).doubleValue();
|
||||
return functionOut.apply(x).doubleValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import net.minecraft.client.option.GameOptions;
|
||||
import net.minecraft.client.option.SimpleOption;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@Mixin(GameOptions.class)
|
||||
public abstract class MixinGameOptions {
|
||||
@Shadow @Final private SimpleOption<Integer> menuBackgroundBlurriness;
|
||||
@Shadow @Final private SimpleOption<Double> chatLineSpacing;
|
||||
|
||||
@Redirect(method = "<init>", at = @At(value = "NEW", target = "net/minecraft/client/option/SimpleOption$ValidatingIntSliderCallbacks", ordinal = 2))
|
||||
private SimpleOption.ValidatingIntSliderCallbacks blur$increaseMaxBlurriness(int minInclusive, int maxInclusive) {
|
||||
if (this.menuBackgroundBlurriness == null && this.chatLineSpacing != null)
|
||||
return new SimpleOption.ValidatingIntSliderCallbacks(minInclusive, 20);
|
||||
return new SimpleOption.ValidatingIntSliderCallbacks(minInclusive, maxInclusive);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.BlurInfo;
|
||||
import net.minecraft.client.render.GameRenderer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.ModifyVariable;
|
||||
|
||||
@Mixin(GameRenderer.class)
|
||||
public class MixinGameRenderer {
|
||||
@ModifyVariable(method = "renderBlur", at = @At("STORE"), ordinal = 0)
|
||||
private float blur$modifyRadius(float radius) { // Modify the radius based on the animation progress
|
||||
if (!BlurInfo.screenChanged && BlurInfo.start >= 0) // Only update the progress after all tests have been completed
|
||||
Blur.updateProgress(BlurInfo.screenHasBlur);
|
||||
return radius * BlurInfo.progress;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
import eu.midnightdust.lib.util.PlatformFunctions;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(HandledScreen.class)
|
||||
public class MixinHandledScreen extends Screen {
|
||||
protected MixinHandledScreen(Text title) {
|
||||
super(title);
|
||||
}
|
||||
|
||||
@Inject(method = "renderBackground", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/ingame/HandledScreen;drawBackground(Lnet/minecraft/client/gui/DrawContext;FII)V", shift = At.Shift.BEFORE))
|
||||
private void blur$renderContainerBlur(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
|
||||
if (BlurConfig.blurContainers) this.applyBlur();
|
||||
}
|
||||
@Inject(at = @At("HEAD"), method = "render")
|
||||
public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||
if (PlatformFunctions.getPlatformName().equals("neoforge")) Blur.onRender();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.BlurInfo;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.client.gui.hud.InGameHud;
|
||||
import net.minecraft.client.render.RenderTickCounter;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(InGameHud.class)
|
||||
public class MixinInGameHud {
|
||||
@Final @Shadow private MinecraftClient client;
|
||||
|
||||
@Inject(at = @At("TAIL"), method = "render")
|
||||
public void blur$renderFadeOut(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) { // Adds a fade-out effect when a player is in a world and closes all screens
|
||||
if (client.currentScreen == null && client.world != null && BlurInfo.start >= 0 && BlurInfo.prevScreenHasBlur) {
|
||||
BlurInfo.doTest = false;
|
||||
BlurInfo.screenChanged = false;
|
||||
this.client.gameRenderer.renderBlur();
|
||||
|
||||
if (BlurInfo.prevScreenHasBackground) Blur.renderRotatedGradient(context, client.getWindow().getScaledWidth(), client.getWindow().getScaledHeight());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
@Mixin(value = MidnightConfig.EntryInfo.class, remap = false)
|
||||
public abstract class MixinMidnightConfig$EntryInfo {
|
||||
@Shadow @Final public String modid;
|
||||
@Shadow @Final public String fieldName;
|
||||
@Shadow Object value;
|
||||
|
||||
@Inject(at = @At(value = "TAIL"), method = "updateFieldValue")
|
||||
private void blur$instantlyApplyRadius(CallbackInfo ci) {
|
||||
if (Objects.equals(modid, Blur.MOD_ID) && Objects.equals(fieldName, "radius"))
|
||||
MinecraftClient.getInstance().options.getMenuBackgroundBlurriness().setValue((int) value);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(MidnightConfig.class)
|
||||
public abstract class MixinMidnightConfig {
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lcom/google/gson/Gson;fromJson(Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object;", shift = At.Shift.AFTER), remap = false, method = "loadValuesFromJson")
|
||||
private static void blur$syncRadius(CallbackInfo ci) {
|
||||
BlurConfig.radius = MinecraftClient.getInstance().options.getMenuBackgroundBlurrinessValue();
|
||||
}
|
||||
}
|
||||
30
common/src/main/java/eu/midnightdust/blur/mixin/MixinMinecraftClient.java
Executable file
30
common/src/main/java/eu/midnightdust/blur/mixin/MixinMinecraftClient.java
Executable file
@@ -0,0 +1,30 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.BlurInfo;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
|
||||
@Mixin(MinecraftClient.class)
|
||||
public class MixinMinecraftClient {
|
||||
|
||||
@Inject(method = "setScreen",
|
||||
at = @At(value = "FIELD",
|
||||
target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
|
||||
opcode = Opcodes.PUTFIELD))
|
||||
private void blur$onScreenOpen(Screen newScreen, CallbackInfo info) {
|
||||
if (BlurInfo.lastScreenChange < System.currentTimeMillis() - 100) { // For some reason, in certain scenarios the screen is set to a new one multiple times in a tick. We want to avoid that.
|
||||
// Here, we reset all tests, to check if the new screen has blur and/or a background
|
||||
BlurInfo.reset(newScreen);
|
||||
|
||||
// Manually activate the onScreenChange method when all screens are closed (in-game)
|
||||
if (newScreen == null) Blur.onScreenChange();
|
||||
}
|
||||
}
|
||||
}
|
||||
65
common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java
Executable file
65
common/src/main/java/eu/midnightdust/blur/mixin/MixinScreen.java
Executable file
@@ -0,0 +1,65 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
|
||||
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
|
||||
import eu.midnightdust.blur.BlurInfo;
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
import net.minecraft.client.MinecraftClient;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
import org.spongepowered.asm.mixin.Final;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.Unique;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(Screen.class)
|
||||
public abstract class MixinScreen {
|
||||
@Shadow @Final protected Text title;
|
||||
@Shadow protected MinecraftClient client;
|
||||
@Shadow public int width;
|
||||
@Shadow public int height;
|
||||
@Shadow protected abstract void applyBlur();
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "render")
|
||||
public void blur$processScreenChange(DrawContext context, int mouseX, int mouseY, float delta, CallbackInfo ci) {
|
||||
Blur.onRender();
|
||||
Blur.renderFadeout(context, width, height, client);
|
||||
}
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "applyBlur", cancellable = true)
|
||||
public void blur$getBlurEnabled(CallbackInfo ci) {
|
||||
if (BlurConfig.forceDisabledScreens.contains(this.getClass().getCanonicalName())) {
|
||||
ci.cancel(); return;
|
||||
}
|
||||
if (!BlurConfig.excludedScreens.contains(this.getClass().getCanonicalName()))
|
||||
BlurInfo.screenHasBlur = true; // Test if the screen has blur
|
||||
}
|
||||
|
||||
@WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screen/Screen;renderBackgroundTexture(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/util/Identifier;IIFFII)V"), method = "renderDarkening(Lnet/minecraft/client/gui/DrawContext;IIII)V")
|
||||
private void blur$applyGradient(DrawContext context, Identifier texture, int x, int y, float u, float v, int width, int height, Operation<Void> original) {
|
||||
if (BlurConfig.useGradient) {
|
||||
blur$renderGradient(context); // Replaces the background texture with a gradient
|
||||
} else original.call(context, texture, x, y, u, v, width, height);
|
||||
}
|
||||
|
||||
@WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;fillGradient(IIIIII)V"), method = "renderInGameBackground")
|
||||
public void blur$rotatedGradient(DrawContext context, int startX, int startY, int endX, int endY, int colorStart, int colorEnd, Operation<Void> original) {
|
||||
blur$renderGradient(context);
|
||||
}
|
||||
@Unique
|
||||
private void blur$renderGradient(DrawContext context) {
|
||||
BlurInfo.screenHasBackground = true; // Test if the screen has a background
|
||||
if (BlurConfig.forceEnabledScreens.contains(this.getClass().getCanonicalName()))
|
||||
this.applyBlur();
|
||||
|
||||
Blur.renderRotatedGradient(context, width, height); // Replaces the default gradient with our rotated one
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
import net.minecraft.client.gui.DrawContext;
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import net.minecraft.client.gui.screen.TitleScreen;
|
||||
import net.minecraft.text.Text;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(TitleScreen.class)
|
||||
public abstract class MixinTitleScreen extends Screen {
|
||||
protected MixinTitleScreen(Text title) {
|
||||
super(title);
|
||||
}
|
||||
|
||||
@Inject(method = "renderPanoramaBackground", at = @At("TAIL"))
|
||||
private void blur$renderTitleBlur(DrawContext context, float delta, CallbackInfo ci) { // Applies the blur effect in containers (Inventory, Chest, etc.)
|
||||
if (BlurConfig.blurTitleScreen) {
|
||||
Blur.updateProgress(true);
|
||||
this.applyBlur();
|
||||
if (BlurConfig.darkenTitleScreen) this.renderDarkening(context);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
package eu.midnightdust.blur.mixin;
|
||||
|
||||
import net.minecraft.client.gui.screen.Screen;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Invoker;
|
||||
|
||||
@Mixin(Screen.class)
|
||||
public interface ScreenAccessor {
|
||||
@Invoker("applyBlur")
|
||||
void forceApplyBlur();
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package eu.midnightdust.blur.util;
|
||||
|
||||
import eu.midnightdust.blur.config.BlurConfig;
|
||||
|
||||
public class RainbowColor {
|
||||
public static int rotation;
|
||||
public static float hue;
|
||||
public static float hue2 = 0.35f;
|
||||
|
||||
public static void tick() {
|
||||
if (BlurConfig.rainbowMode) {
|
||||
if (hue >= 1) hue = 0f;
|
||||
hue += 0.01f;
|
||||
if (hue2 >= 1) hue2 = 0f;
|
||||
hue2 += 0.01f;
|
||||
|
||||
if (rotation >= 360) rotation = 0;
|
||||
rotation += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
common/src/main/resources/assets/blur/icon.png
Normal file
BIN
common/src/main/resources/assets/blur/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
36
common/src/main/resources/assets/blur/lang/de_de.json
Normal file
36
common/src/main/resources/assets/blur/lang/de_de.json
Normal file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Blur+ Konfiguration",
|
||||
"blur.midnightconfig.category.animations": "Animationen",
|
||||
"blur.midnightconfig.category.screens": "Bildschirme",
|
||||
"blur.midnightconfig.category.style": "Stil",
|
||||
"blur.midnightconfig.blurContainers": "Unschärfe in Containern",
|
||||
"blur.midnightconfig.blurTitleScreen": "Unschärfe im Titelbildschirm",
|
||||
"blur.midnightconfig.darkenTitleScreen": "Abgedunkelter Titelhintergrund",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Überblendzeit (in Millisekunden)",
|
||||
"blur.midnightconfig.fadeOutTimeMillis": "Ausblendzeit (in Millisekunden)",
|
||||
"blur.midnightconfig.animationCurve": "Animationskurve",
|
||||
"blur.midnightconfig.enum.Easing.FLAT": "Flach",
|
||||
"blur.midnightconfig.enum.Easing.SINE": "Sinus",
|
||||
"blur.midnightconfig.enum.Easing.QUAD": "Quadriert",
|
||||
"blur.midnightconfig.enum.Easing.CUBIC": "Kubiert",
|
||||
"blur.midnightconfig.enum.Easing.QUART": "Quart",
|
||||
"blur.midnightconfig.enum.Easing.QUINT": "Quint",
|
||||
"blur.midnightconfig.enum.Easing.EXPO": "Expo",
|
||||
"blur.midnightconfig.enum.Easing.CIRC": "Kreis",
|
||||
"blur.midnightconfig.enum.Easing.BACK": "Zurück",
|
||||
"blur.midnightconfig.enum.Easing.ELASTIC": "Elastisch",
|
||||
"blur.midnightconfig.radius": "Radius",
|
||||
"blur.midnightconfig.rainbowMode": "Regenbogenmodus \uD83C\uDF08",
|
||||
"blur.midnightconfig.useGradient": "Farbverlauf im Hintergrund",
|
||||
"blur.midnightconfig.gradientStart": "Farbverlauf-Anfangsfarbe",
|
||||
"blur.midnightconfig.gradientEnd": "Farbverlauf-Endfarbe",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Farbverlauf-Anfangstransparenz",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Farbverlauf-Endstransparenz",
|
||||
"blur.midnightconfig.gradientRotation": "Farbverlauf-Rotation",
|
||||
"blur.midnightconfig.excludedScreens": "Ausgeschlossene Bildschirme",
|
||||
"blur.midnightconfig._general": "§7⛏ Generell",
|
||||
"blur.midnightconfig._advanced": "§7⚒ Fortgeschritten",
|
||||
"blur.midnightconfig._blur": "§7▒ Unschärfe",
|
||||
"blur.midnightconfig._gradient": "§7\uD83D\uDFE2 Farbverlauf",
|
||||
"blur.midnightconfig._animations": "§7\uD83D\uDCFD Animationen"
|
||||
}
|
||||
4
common/src/main/resources/assets/blur/lang/en_gb.json
Normal file
4
common/src/main/resources/assets/blur/lang/en_gb.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"blur.midnightconfig.gradientStart": "Gradient Start Colour",
|
||||
"blur.midnightconfig.gradientEnd": "Gradient End Colour"
|
||||
}
|
||||
42
common/src/main/resources/assets/blur/lang/en_us.json
Executable file
42
common/src/main/resources/assets/blur/lang/en_us.json
Executable file
@@ -0,0 +1,42 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Blur+ Config",
|
||||
"blur.midnightconfig.category.animations": "Animations",
|
||||
"blur.midnightconfig.category.style": "Style",
|
||||
"blur.midnightconfig.category.screens": "Screens",
|
||||
"blur.midnightconfig.blurContainers": "Apply Blur to Containers",
|
||||
"blur.midnightconfig.blurTitleScreen": "Apply Blur to Title Screen",
|
||||
"blur.midnightconfig.darkenTitleScreen": "Darken Title Screen Background",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
|
||||
"blur.midnightconfig.fadeOutTimeMillis": "Fade Out Time (in milliseconds)",
|
||||
"blur.midnightconfig.animationCurve": "Animation Curve",
|
||||
"blur.midnightconfig.enum.Easing.FLAT": "Flat",
|
||||
"blur.midnightconfig.enum.Easing.SINE": "Sine",
|
||||
"blur.midnightconfig.enum.Easing.QUAD": "Quad",
|
||||
"blur.midnightconfig.enum.Easing.CUBIC": "Cubic",
|
||||
"blur.midnightconfig.enum.Easing.QUART": "Quart",
|
||||
"blur.midnightconfig.enum.Easing.QUINT": "Quint",
|
||||
"blur.midnightconfig.enum.Easing.EXPO": "Expo",
|
||||
"blur.midnightconfig.enum.Easing.CIRC": "Circ",
|
||||
"blur.midnightconfig.enum.Easing.BACK": "Back",
|
||||
"blur.midnightconfig.enum.Easing.ELASTIC": "Elastic",
|
||||
"blur.midnightconfig.radius": "Radius",
|
||||
"blur.midnightconfig.radius.label.tooltip": "Mirror of \"Menu Background Blur\" found in Minecraft's Accessibility Settings",
|
||||
"blur.midnightconfig.rainbowMode": "Rainbow Mode \uD83C\uDF08",
|
||||
"blur.midnightconfig.useGradient": "Gradient as Background",
|
||||
"blur.midnightconfig.gradientStart": "Gradient Start Color",
|
||||
"blur.midnightconfig.gradientEnd": "Gradient End Color",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Gradient Start Alpha",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Gradient End Alpha",
|
||||
"blur.midnightconfig.gradientRotation": "Gradient Rotation",
|
||||
"blur.midnightconfig.excludedScreens": "Excluded Screens",
|
||||
"blur.midnightconfig.excludedScreens.tooltip": "Screens that Blur+ should not animate",
|
||||
"blur.midnightconfig.forceEnabledScreens": "Force-enabled Screens",
|
||||
"blur.midnightconfig.forceEnabledScreens.tooltip": "Screens where the vanilla blur effect should be force-enabled\nMight not work 100% of the time",
|
||||
"blur.midnightconfig.forceDisabledScreens": "Force-disabled Screens",
|
||||
"blur.midnightconfig.forceDisabledScreens.tooltip": "Screens where the vanilla blur effect should be force-disabled",
|
||||
"blur.midnightconfig._general": "§7⛏ General",
|
||||
"blur.midnightconfig._advanced": "§7⚒ Advanced",
|
||||
"blur.midnightconfig._blur": "§7▒ Blur",
|
||||
"blur.midnightconfig._gradient": "§7\uD83D\uDFE2 Gradient",
|
||||
"blur.midnightconfig._animations": "§7\uD83D\uDCFD Animations"
|
||||
}
|
||||
27
common/src/main/resources/assets/blur/lang/es_mx.json
Normal file
27
common/src/main/resources/assets/blur/lang/es_mx.json
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Configuración de Blur+",
|
||||
"blur.midnightconfig.category.animations": "Animaciones",
|
||||
"blur.midnightconfig.category.style": "Estilo",
|
||||
"blur.midnightconfig.blurContainers": "Aplicar desenfoque a los contenedores",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Tiempo de desvanecimiento (en milisegundos)",
|
||||
"blur.midnightconfig.fadeOutTimeMillis": "Tiempo de desvanecimiento de salida (en milisegundos)",
|
||||
"blur.midnightconfig.animationCurve": "Curva de animación",
|
||||
"blur.midnightconfig.enum.Easing.FLAT": "Plano",
|
||||
"blur.midnightconfig.enum.Easing.SINE": "Seno",
|
||||
"blur.midnightconfig.enum.Easing.QUAD": "Cuadrático",
|
||||
"blur.midnightconfig.enum.Easing.CUBIC": "Cúbico",
|
||||
"blur.midnightconfig.enum.Easing.QUART": "Cuarto",
|
||||
"blur.midnightconfig.enum.Easing.QUINT": "Quinto",
|
||||
"blur.midnightconfig.enum.Easing.EXPO": "Exponencial",
|
||||
"blur.midnightconfig.enum.Easing.CIRC": "Circular",
|
||||
"blur.midnightconfig.enum.Easing.BACK": "Atrás",
|
||||
"blur.midnightconfig.enum.Easing.ELASTIC": "Elástico",
|
||||
"blur.midnightconfig.radius": "Radio",
|
||||
"blur.midnightconfig.rainbowMode": "Modo Arcoíris \uD83C\uDF08",
|
||||
"blur.midnightconfig.useGradient": "Usar degradado como fondo",
|
||||
"blur.midnightconfig.gradientStart": "Color de inicio del degradado",
|
||||
"blur.midnightconfig.gradientEnd": "Color de fin del degradado",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Alfa de inicio del degradado",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Alfa de fin del degradado",
|
||||
"blur.midnightconfig.gradientRotation": "Rotación del degradado"
|
||||
}
|
||||
12
common/src/main/resources/assets/blur/lang/fr_fr.json
Normal file
12
common/src/main/resources/assets/blur/lang/fr_fr.json
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Configuration du flou",
|
||||
"blur.midnightconfig.blurExclusions": "Flouter les exclusions",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Temps de fondu (en millisecondes)",
|
||||
"blur.midnightconfig.ease": "Fluidité de l'animation",
|
||||
"blur.midnightconfig.radius": "Rayon",
|
||||
"blur.midnightconfig.gradientStart": "Couleur de départ du dégradé",
|
||||
"blur.midnightconfig.gradientEnd": "Couleur de fin du dégradé",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Alpha de début du dégradé",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Alpha de fin du dégradé",
|
||||
"blur.midnightconfig.showScreenTitle": "Montrer le titre de l'écran"
|
||||
}
|
||||
11
common/src/main/resources/assets/blur/lang/ko_kr.json
Normal file
11
common/src/main/resources/assets/blur/lang/ko_kr.json
Normal file
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Blur 설정",
|
||||
"blur.midnightconfig.blurExclusions": "블러 제외",
|
||||
"blur.midnightconfig.fadeTimeMillis": "페이드 시간 (밀리초 단위)",
|
||||
"blur.midnightconfig.radius": "범위",
|
||||
"blur.midnightconfig.gradientStart": "그라디언트 시작 색상",
|
||||
"blur.midnightconfig.gradientEnd": "그라디언트 종료 색상",
|
||||
"blur.midnightconfig.gradientStartAlpha": "그라디언트 시작 알파",
|
||||
"blur.midnightconfig.gradientEndAlpha": "그라디언트 종료 알파",
|
||||
"blur.midnightconfig.showScreenTitle": "화면 타이틀 보기"
|
||||
}
|
||||
12
common/src/main/resources/assets/blur/lang/pt_br.json
Normal file
12
common/src/main/resources/assets/blur/lang/pt_br.json
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Configuração de desfoque",
|
||||
"blur.midnightconfig.blurExclusions": "Desfocar exclusões",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Tempo de desvanecimento (em milissegundos)",
|
||||
"blur.midnightconfig.ease": "Animação fácil",
|
||||
"blur.midnightconfig.radius": "Raio",
|
||||
"blur.midnightconfig.gradientStart": "Cor inicial do gradiente",
|
||||
"blur.midnightconfig.gradientEnd": "Cor final do gradiente",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Alfa de início gradiente",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Alfa de Gradiente Final",
|
||||
"blur.midnightconfig.showScreenTitle": "Mostrar título da tela"
|
||||
}
|
||||
27
common/src/main/resources/assets/blur/lang/ru_ru.json
Normal file
27
common/src/main/resources/assets/blur/lang/ru_ru.json
Normal file
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Настройки Blur+",
|
||||
"blur.midnightconfig.category.animations": "Анимации",
|
||||
"blur.midnightconfig.category.style": "Стиль",
|
||||
"blur.midnightconfig.blurContainers": "Применять размытие к контейнерам",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Время размытия (в миллисекундах)",
|
||||
"blur.midnightconfig.fadeOutTimeMillis": "Время затухания (в миллисекундах)",
|
||||
"blur.midnightconfig.animationCurve": "Кривая анимации",
|
||||
"blur.midnightconfig.enum.Easing.FLAT": "Плоская",
|
||||
"blur.midnightconfig.enum.Easing.SINE": "Синусоидальная",
|
||||
"blur.midnightconfig.enum.Easing.QUAD": "Квадратная",
|
||||
"blur.midnightconfig.enum.Easing.CUBIC": "Кубическая",
|
||||
"blur.midnightconfig.enum.Easing.QUART": "Квартовая",
|
||||
"blur.midnightconfig.enum.Easing.QUINT": "Квинтовая",
|
||||
"blur.midnightconfig.enum.Easing.EXPO": "Экспоненциальная",
|
||||
"blur.midnightconfig.enum.Easing.CIRC": "Круговая",
|
||||
"blur.midnightconfig.enum.Easing.BACK": "Обратная",
|
||||
"blur.midnightconfig.enum.Easing.ELASTIC": "Упругая",
|
||||
"blur.midnightconfig.radius": "Радиус размытия",
|
||||
"blur.midnightconfig.rainbowMode": "Радужный режим \uD83C\uDF08",
|
||||
"blur.midnightconfig.useGradient": "Градиент в качестве фона",
|
||||
"blur.midnightconfig.gradientStart": "Верхний цвет градиента",
|
||||
"blur.midnightconfig.gradientEnd": "Нижний цвет градиента",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Альфа-начало градиента",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Альфа-конец градиента",
|
||||
"blur.midnightconfig.gradientRotation": "Вращение градиента"
|
||||
}
|
||||
9
common/src/main/resources/assets/blur/lang/sv_se.json
Normal file
9
common/src/main/resources/assets/blur/lang/sv_se.json
Normal file
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Blur Config",
|
||||
"blur.midnightconfig.blurExclusions": "Undantag till Blur",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Toningstid (i millisekunder)",
|
||||
"blur.midnightconfig.radius": "Radie",
|
||||
"blur.midnightconfig.gradientStart": "Toningsfärg (start)",
|
||||
"blur.midnightconfig.gradientEnd": "Toningsfärg (slut)",
|
||||
"blur.midnightconfig.showScreenTitle": "Visa skärmtitel"
|
||||
}
|
||||
12
common/src/main/resources/assets/blur/lang/uk_ua.json
Normal file
12
common/src/main/resources/assets/blur/lang/uk_ua.json
Normal file
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Конфігурація Blur",
|
||||
"blur.midnightconfig.blurExclusions": "Винятки розмиття",
|
||||
"blur.midnightconfig.fadeTimeMillis": "Час появи розмиття (у мілісекундах)",
|
||||
"blur.midnightconfig.ease": "Пом'якшення анімації",
|
||||
"blur.midnightconfig.radius": "Радіус",
|
||||
"blur.midnightconfig.gradientStart": "Початковий колір градієнта",
|
||||
"blur.midnightconfig.gradientEnd": "Кінцевий колір градієнта",
|
||||
"blur.midnightconfig.gradientStartAlpha": "Початкова прозорість градієнта",
|
||||
"blur.midnightconfig.gradientEndAlpha": "Кінцева прозорість градієнтаa",
|
||||
"blur.midnightconfig.showScreenTitle": "Показати назву екрана"
|
||||
}
|
||||
28
common/src/main/resources/assets/blur/lang/zh_cn.json
Normal file
28
common/src/main/resources/assets/blur/lang/zh_cn.json
Normal file
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "模糊 (Blur+) 配置",
|
||||
"blur.midnightconfig.category.animations": "动画",
|
||||
"blur.midnightconfig.category.style": "样式",
|
||||
"blur.midnightconfig.blurContainers": "使用容器时启用",
|
||||
"blur.midnightconfig.fadeTimeMillis": "淡入时间(毫秒)",
|
||||
"blur.midnightconfig.fadeOutTimeMillis": "淡出时间(毫秒)",
|
||||
"blur.midnightconfig.animationCurve": "动画曲线",
|
||||
"blur.midnightconfig.enum.Easing.FLAT": "平滑(Flat)",
|
||||
"blur.midnightconfig.enum.Easing.SINE": "正弦(Sine)",
|
||||
"blur.midnightconfig.enum.Easing.QUAD": "二次(Quad)",
|
||||
"blur.midnightconfig.enum.Easing.CUBIC": "三次(Cubic)",
|
||||
"blur.midnightconfig.enum.Easing.QUART": "四次(Quart)",
|
||||
"blur.midnightconfig.enum.Easing.QUINT": "五次(Quint)",
|
||||
"blur.midnightconfig.enum.Easing.EXPO": "指数(Expo)",
|
||||
"blur.midnightconfig.enum.Easing.CIRC": "圆周(Circ)",
|
||||
"blur.midnightconfig.enum.Easing.BACK": "回弹(Back)",
|
||||
"blur.midnightconfig.enum.Easing.ELASTIC": "弹性(Elastic)",
|
||||
"blur.midnightconfig.radius": "半径",
|
||||
"blur.midnightconfig.rainbowMode": "彩虹模式 \uD83C\uDF08",
|
||||
"blur.midnightconfig.useGradient": "背景渐变",
|
||||
"blur.midnightconfig.gradientStart": "渐变起始色",
|
||||
"blur.midnightconfig.gradientEnd": "渐变结束色",
|
||||
"blur.midnightconfig.gradientStartAlpha": "渐变起始 Alpha 通道",
|
||||
"blur.midnightconfig.gradientEndAlpha": "渐变结束 Alpha 通道",
|
||||
"blur.midnightconfig.gradientRotation": "渐变旋转",
|
||||
"blur.midnightconfig.excludedScreens": "禁用的界面"
|
||||
}
|
||||
28
common/src/main/resources/assets/blur/lang/zh_tw.json
Normal file
28
common/src/main/resources/assets/blur/lang/zh_tw.json
Normal file
@@ -0,0 +1,28 @@
|
||||
{
|
||||
"blur.midnightconfig.title": "Blur+ 設定",
|
||||
"blur.midnightconfig.category.animations": "動畫",
|
||||
"blur.midnightconfig.category.style": "風格",
|
||||
"blur.midnightconfig.blurContainers": "對容器套用模糊",
|
||||
"blur.midnightconfig.fadeTimeMillis": "淡入時間(毫秒)",
|
||||
"blur.midnightconfig.fadeOutTimeMillis": "淡出時間(毫秒)",
|
||||
"blur.midnightconfig.animationCurve": "動畫曲線",
|
||||
"blur.midnightconfig.enum.Easing.FLAT": "線性(Flat)",
|
||||
"blur.midnightconfig.enum.Easing.SINE": "正弦(Sine)",
|
||||
"blur.midnightconfig.enum.Easing.QUAD": "二次(Quad)",
|
||||
"blur.midnightconfig.enum.Easing.CUBIC": "三次(Cubic)",
|
||||
"blur.midnightconfig.enum.Easing.QUART": "四次(Quart)",
|
||||
"blur.midnightconfig.enum.Easing.QUINT": "五次(Quint)",
|
||||
"blur.midnightconfig.enum.Easing.EXPO": "指數(Expo)",
|
||||
"blur.midnightconfig.enum.Easing.CIRC": "圓形(Circ)",
|
||||
"blur.midnightconfig.enum.Easing.BACK": "回彈(Back)",
|
||||
"blur.midnightconfig.enum.Easing.ELASTIC": "彈性(Elastic)",
|
||||
"blur.midnightconfig.radius": "半徑",
|
||||
"blur.midnightconfig.rainbowMode": "彩虹模式 🌈",
|
||||
"blur.midnightconfig.useGradient": "漸變背景",
|
||||
"blur.midnightconfig.gradientStart": "漸變起始顏色",
|
||||
"blur.midnightconfig.gradientEnd": "漸變結束顏色",
|
||||
"blur.midnightconfig.gradientStartAlpha": "漸變起始 Alpha",
|
||||
"blur.midnightconfig.gradientEndAlpha": "漸變結束 Alpha",
|
||||
"blur.midnightconfig.gradientRotation": "漸變旋轉",
|
||||
"blur.midnightconfig.excludedScreens": "排除畫面"
|
||||
}
|
||||
21
common/src/main/resources/blur.mixins.json
Normal file
21
common/src/main/resources/blur.mixins.json
Normal file
@@ -0,0 +1,21 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "eu.midnightdust.blur.mixin",
|
||||
"compatibilityLevel": "JAVA_21",
|
||||
"client": [
|
||||
"MixinGameOptions",
|
||||
"MixinGameRenderer",
|
||||
"MixinHandledScreen",
|
||||
"MixinInGameHud",
|
||||
"MixinMidnightConfig",
|
||||
"MixinMidnightConfig$EntryInfo",
|
||||
"MixinMinecraftClient",
|
||||
"MixinScreen",
|
||||
"MixinTitleScreen",
|
||||
"ScreenAccessor"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
102
fabric/build.gradle
Normal file
102
fabric/build.gradle
Normal file
@@ -0,0 +1,102 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow'
|
||||
id "me.shedaniel.unified-publishing"
|
||||
}
|
||||
|
||||
architectury {
|
||||
platformSetupLoomIde()
|
||||
fabric()
|
||||
}
|
||||
|
||||
configurations {
|
||||
common
|
||||
shadowCommon // Don't use shadow from the shadow plugin since it *excludes* files.
|
||||
compileClasspath.extendsFrom common
|
||||
runtimeClasspath.extendsFrom common
|
||||
developmentFabric.extendsFrom common
|
||||
archivesBaseName = rootProject.archives_base_name + "-fabric"
|
||||
version = rootProject.mod_version + "+" + rootProject.minecraft_version
|
||||
}
|
||||
|
||||
dependencies {
|
||||
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
|
||||
modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
|
||||
modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric")
|
||||
|
||||
common(project(path: ":common", configuration: "namedElements")) { transitive false }
|
||||
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
|
||||
}
|
||||
|
||||
processResources {
|
||||
inputs.property "version", rootProject.version
|
||||
|
||||
filesMatching("fabric.mod.json") {
|
||||
expand "version": rootProject.version
|
||||
}
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
exclude "architectury.common.json"
|
||||
|
||||
configurations = [project.configurations.shadowCommon]
|
||||
archiveClassifier = "dev-shadow"
|
||||
}
|
||||
|
||||
remapJar {
|
||||
input.set shadowJar.archiveFile
|
||||
dependsOn shadowJar
|
||||
}
|
||||
|
||||
sourcesJar {
|
||||
def commonSources = project(":common").sourcesJar
|
||||
dependsOn commonSources
|
||||
from commonSources.archiveFile.map { zipTree(it) }
|
||||
}
|
||||
|
||||
components.java {
|
||||
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
||||
skip()
|
||||
}
|
||||
}
|
||||
|
||||
unifiedPublishing {
|
||||
project {
|
||||
displayName = "Blur+ $rootProject.version - Fabric $project.minecraft_version"
|
||||
releaseType = "$project.release_type"
|
||||
changelog = releaseChangelog()
|
||||
gameVersions = []
|
||||
gameLoaders = ["fabric","quilt"]
|
||||
mainPublication remapJar
|
||||
relations {
|
||||
depends {
|
||||
curseforge = "fabric-api"
|
||||
modrinth = "fabric-api"
|
||||
}
|
||||
includes {
|
||||
curseforge = "midnightlib"
|
||||
modrinth = "midnightlib"
|
||||
}
|
||||
}
|
||||
|
||||
var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
|
||||
if (CURSEFORGE_TOKEN != null) {
|
||||
curseforge {
|
||||
token = CURSEFORGE_TOKEN
|
||||
id = rootProject.curseforge_id
|
||||
gameVersions.addAll "Java 21", project.minecraft_version
|
||||
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||
}
|
||||
}
|
||||
|
||||
var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
|
||||
if (MODRINTH_TOKEN != null) {
|
||||
modrinth {
|
||||
token = MODRINTH_TOKEN
|
||||
id = rootProject.modrinth_id
|
||||
version = "$rootProject.version-$project.name"
|
||||
gameVersions.addAll project.minecraft_version
|
||||
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package eu.midnightdust.blur.fabric;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.util.RainbowColor;
|
||||
import net.fabricmc.api.ClientModInitializer;
|
||||
import net.fabricmc.api.ModInitializer;
|
||||
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
|
||||
|
||||
public class BlurFabric implements ModInitializer, ClientModInitializer {
|
||||
@Override
|
||||
public void onInitialize() {
|
||||
Blur.init();
|
||||
}
|
||||
@Override
|
||||
public void onInitializeClient() {
|
||||
ClientTickEvents.END_CLIENT_TICK.register(client -> RainbowColor.tick());
|
||||
}
|
||||
}
|
||||
36
fabric/src/main/resources/fabric.mod.json
Executable file
36
fabric/src/main/resources/fabric.mod.json
Executable file
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "blur",
|
||||
"name": "Blur+",
|
||||
"version": "$version",
|
||||
"environment": "client",
|
||||
"license": "MIT",
|
||||
"icon": "assets/blur/icon.png",
|
||||
"entrypoints": {
|
||||
"main": [
|
||||
"eu.midnightdust.blur.fabric.BlurFabric"
|
||||
],
|
||||
"client": [
|
||||
"eu.midnightdust.blur.fabric.BlurFabric"
|
||||
]
|
||||
},
|
||||
"contact": {
|
||||
"homepage": "https://modrinth.com/mod/blur-fabric",
|
||||
"sources": "https://github.com/Motschen/Blur",
|
||||
"issues": "https://github.com/Motschen/Blur/issues"
|
||||
},
|
||||
"authors": [
|
||||
"Motschen",
|
||||
"tterrag1098",
|
||||
"Pyrofab",
|
||||
"backryun",
|
||||
"byquanton"
|
||||
],
|
||||
"description": "Various enhancements for the blur effect behind Minecraft GUIs",
|
||||
"mixins": [
|
||||
"blur.mixins.json"
|
||||
],
|
||||
"depends": {
|
||||
"minecraft": ">=1.21.2"
|
||||
}
|
||||
}
|
||||
29
gradle.properties
Normal file → Executable file
29
gradle.properties
Normal file → Executable file
@@ -1,6 +1,27 @@
|
||||
minecraft_version=1.10.2
|
||||
forge_version=12.18.3.2297
|
||||
mod_version=1.0.4
|
||||
# Done to increase the memory available to gradle.
|
||||
org.gradle.jvmargs=-Xmx2G
|
||||
org.gradle.parallel=true
|
||||
|
||||
project_id=268324
|
||||
minecraft_version=1.21.4
|
||||
supported_versions=1.21.5
|
||||
yarn_mappings=1.21.4+build.1
|
||||
enabled_platforms=fabric,neoforge
|
||||
|
||||
# Mod Properties
|
||||
mod_version=5.2.0
|
||||
maven_group=eu.midnightdust.blur
|
||||
archives_base_name=blur
|
||||
release_type=release
|
||||
curseforge_id=393563
|
||||
modrinth_id=NK39zBp2
|
||||
|
||||
# Modloaders
|
||||
fabric_loader_version=0.16.9
|
||||
fabric_api_version=0.111.0+1.21.4
|
||||
|
||||
neoforge_version=21.4.10-beta
|
||||
yarn_mappings_patch_neoforge_version = 1.21+build.4
|
||||
|
||||
# Libraries
|
||||
midnightlib_version = 1.7.0+1.21.4
|
||||
modmenu_version = 11.0.2
|
||||
|
||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
7
gradle/wrapper/gradle-wrapper.properties
vendored
7
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,7 @@
|
||||
#Wed Aug 20 15:17:58 CDT 2014
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
|
||||
zipStorePath=wrapper/dists
|
||||
302
gradlew
vendored
Normal file → Executable file
302
gradlew
vendored
Normal file → Executable file
@@ -1,79 +1,129 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015-2021 the original authors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# https://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
#
|
||||
# Gradle start up script for POSIX generated by Gradle.
|
||||
#
|
||||
# Important for running:
|
||||
#
|
||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||
# noncompliant, but you have some other compliant shell such as ksh or
|
||||
# bash, then to run this script, type that shell name before the whole
|
||||
# command line, like:
|
||||
#
|
||||
# ksh Gradle
|
||||
#
|
||||
# Busybox and similar reduced shells will NOT work, because this script
|
||||
# requires all of these POSIX shell features:
|
||||
# * functions;
|
||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||
# * compound commands having a testable exit status, especially «case»;
|
||||
# * various built-in commands including «command», «set», and «ulimit».
|
||||
#
|
||||
# Important for patching:
|
||||
#
|
||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||
#
|
||||
# The "traditional" practice of packing multiple parameters into a
|
||||
# space-separated string is a well documented source of bugs and security
|
||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||
# options in "$@", and eventually passing that to Java.
|
||||
#
|
||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||
# see the in-line comments for details.
|
||||
#
|
||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||
# Darwin, MinGW, and NonStop.
|
||||
#
|
||||
# (3) This script is generated from the Groovy template
|
||||
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
APP_BASE_NAME=${0##*/}
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD="maximum"
|
||||
MAX_FD=maximum
|
||||
|
||||
warn ( ) {
|
||||
warn () {
|
||||
echo "$*"
|
||||
}
|
||||
} >&2
|
||||
|
||||
die ( ) {
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
}
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
case "`uname`" in
|
||||
CYGWIN* )
|
||||
cygwin=true
|
||||
;;
|
||||
Darwin* )
|
||||
darwin=true
|
||||
;;
|
||||
MINGW* )
|
||||
msys=true
|
||||
;;
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
# For Cygwin, ensure paths are in UNIX format before anything is touched.
|
||||
if $cygwin ; then
|
||||
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
|
||||
fi
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >&-
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >&-
|
||||
|
||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD="$JAVA_HOME/bin/java"
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD="java"
|
||||
JAVACMD=java
|
||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
@@ -90,75 +140,95 @@ location of your Java installation."
|
||||
fi
|
||||
|
||||
# Increase the maximum file descriptors if we can.
|
||||
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
|
||||
MAX_FD_LIMIT=`ulimit -H -n`
|
||||
if [ $? -eq 0 ] ; then
|
||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
||||
MAX_FD="$MAX_FD_LIMIT"
|
||||
fi
|
||||
ulimit -n $MAX_FD
|
||||
if [ $? -ne 0 ] ; then
|
||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
||||
fi
|
||||
else
|
||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Darwin, add options to specify how the application appears in the dock
|
||||
if $darwin; then
|
||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||
fi
|
||||
|
||||
# For Cygwin, switch paths to Windows format before running java
|
||||
if $cygwin ; then
|
||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||
|
||||
# We build the pattern for arguments to be converted via cygpath
|
||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
||||
SEP=""
|
||||
for dir in $ROOTDIRSRAW ; do
|
||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
||||
SEP="|"
|
||||
done
|
||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
||||
# Add a user-defined pattern to the cygpath arguments
|
||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
||||
fi
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
i=0
|
||||
for arg in "$@" ; do
|
||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
||||
|
||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
||||
else
|
||||
eval `echo args$i`="\"$arg\""
|
||||
fi
|
||||
i=$((i+1))
|
||||
done
|
||||
case $i in
|
||||
(0) set -- ;;
|
||||
(1) set -- "$args0" ;;
|
||||
(2) set -- "$args0" "$args1" ;;
|
||||
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||
case $MAX_FD in #(
|
||||
max*)
|
||||
MAX_FD=$( ulimit -H -n ) ||
|
||||
warn "Could not query maximum file descriptor limit"
|
||||
esac
|
||||
case $MAX_FD in #(
|
||||
'' | soft) :;; #(
|
||||
*)
|
||||
ulimit -n "$MAX_FD" ||
|
||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||
esac
|
||||
fi
|
||||
|
||||
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||
function splitJvmOpts() {
|
||||
JVM_OPTS=("$@")
|
||||
}
|
||||
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
|
||||
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
|
||||
# Collect all arguments for the java command, stacking in reverse order:
|
||||
# * args from the command line
|
||||
# * the main class name
|
||||
# * -classpath
|
||||
# * -D...appname settings
|
||||
# * --module-path (only if needed)
|
||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||
|
||||
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||
if "$cygwin" || "$msys" ; then
|
||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
# Collect all arguments for the java command;
|
||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
||||
# shell script including quotes and variable substitutions, so put them in
|
||||
# double quotes to make sure that they get re-expanded; and
|
||||
# * put everything else in single quotes, so that it's not re-expanded.
|
||||
|
||||
set -- \
|
||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||
-classpath "$CLASSPATH" \
|
||||
org.gradle.wrapper.GradleWrapperMain \
|
||||
"$@"
|
||||
|
||||
# Use "xargs" to parse quoted args.
|
||||
#
|
||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||
#
|
||||
# In Bash we could simply go:
|
||||
#
|
||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||
# set -- "${ARGS[@]}" "$@"
|
||||
#
|
||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||
# character that might be a shell metacharacter, then use eval to reverse
|
||||
# that process (while maintaining the separation between arguments), and wrap
|
||||
# the whole thing up as a single "set" statement.
|
||||
#
|
||||
# This will of course break if any of these variables contains a newline or
|
||||
# an unmatched quote.
|
||||
#
|
||||
|
||||
eval "set -- $(
|
||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||
xargs -n1 |
|
||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||
tr '\n' ' '
|
||||
)" '"$@"'
|
||||
|
||||
exec "$JAVACMD" "$@"
|
||||
|
||||
179
gradlew.bat
vendored
179
gradlew.bat
vendored
@@ -1,90 +1,89 @@
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto init
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:init
|
||||
@rem Get command-line arguments, handling Windowz variants
|
||||
|
||||
if not "%OS%" == "Windows_NT" goto win9xME_args
|
||||
if "%@eval[2+2]" == "4" goto 4NT_args
|
||||
|
||||
:win9xME_args
|
||||
@rem Slurp the command line arguments.
|
||||
set CMD_LINE_ARGS=
|
||||
set _SKIP=2
|
||||
|
||||
:win9xME_args_slurp
|
||||
if "x%~1" == "x" goto execute
|
||||
|
||||
set CMD_LINE_ARGS=%*
|
||||
goto execute
|
||||
|
||||
:4NT_args
|
||||
@rem Get arguments from the 4NT Shell from JP Software
|
||||
set CMD_LINE_ARGS=%$
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
@rem
|
||||
@rem Copyright 2015 the original author or authors.
|
||||
@rem
|
||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
||||
@rem you may not use this file except in compliance with the License.
|
||||
@rem You may obtain a copy of the License at
|
||||
@rem
|
||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
||||
@rem
|
||||
@rem Unless required by applicable law or agreed to in writing, software
|
||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
@rem See the License for the specific language governing permissions and
|
||||
@rem limitations under the License.
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
||||
|
||||
@rem Find java.exe
|
||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||
|
||||
set JAVA_EXE=java.exe
|
||||
%JAVA_EXE% -version >NUL 2>&1
|
||||
if "%ERRORLEVEL%" == "0" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo.
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||
echo.
|
||||
echo Please set the JAVA_HOME variable in your environment to match the
|
||||
echo location of your Java installation.
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
||||
|
||||
:fail
|
||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||
rem the _cmd.exe /c_ return code!
|
||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
||||
exit /b 1
|
||||
|
||||
:mainEnd
|
||||
if "%OS%"=="Windows_NT" endlocal
|
||||
|
||||
:omega
|
||||
|
||||
115
neoforge/build.gradle
Normal file
115
neoforge/build.gradle
Normal file
@@ -0,0 +1,115 @@
|
||||
plugins {
|
||||
id 'com.github.johnrengelman.shadow'
|
||||
id "me.shedaniel.unified-publishing"
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
name = 'NeoForged'
|
||||
url = 'https://maven.neoforged.net/releases'
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
architectury {
|
||||
platformSetupLoomIde()
|
||||
neoForge()
|
||||
}
|
||||
|
||||
loom {
|
||||
accessWidenerPath = project(":common").loom.accessWidenerPath
|
||||
}
|
||||
|
||||
configurations {
|
||||
common {
|
||||
canBeResolved = true
|
||||
canBeConsumed = false
|
||||
}
|
||||
compileClasspath.extendsFrom common
|
||||
runtimeClasspath.extendsFrom common
|
||||
developmentNeoForge.extendsFrom common
|
||||
|
||||
// Files in this configuration will be bundled into your mod using the Shadow plugin.
|
||||
// Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
|
||||
shadowBundle {
|
||||
canBeResolved = true
|
||||
canBeConsumed = false
|
||||
}
|
||||
archivesBaseName = rootProject.archives_base_name + "-neoforge"
|
||||
version = rootProject.mod_version + "+" + rootProject.minecraft_version
|
||||
}
|
||||
|
||||
dependencies {
|
||||
neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
|
||||
modImplementation ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-neoforge")
|
||||
|
||||
common(project(path: ':common', configuration: 'namedElements')) { transitive false }
|
||||
shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
|
||||
}
|
||||
|
||||
processResources {
|
||||
inputs.property 'version', rootProject.version
|
||||
|
||||
filesMatching('META-INF/neoforge.mods.toml') {
|
||||
expand version: rootProject.version
|
||||
}
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.shadowBundle]
|
||||
archiveClassifier = 'dev-shadow'
|
||||
}
|
||||
|
||||
remapJar {
|
||||
input.set shadowJar.archiveFile
|
||||
}
|
||||
|
||||
sourcesJar {
|
||||
def commonSources = project(":common").sourcesJar
|
||||
dependsOn commonSources
|
||||
from commonSources.archiveFile.map { zipTree(it) }
|
||||
}
|
||||
|
||||
components.java {
|
||||
withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
|
||||
skip()
|
||||
}
|
||||
}
|
||||
|
||||
unifiedPublishing {
|
||||
project {
|
||||
displayName = "Blur+ $rootProject.version - NeoForge $project.minecraft_version"
|
||||
releaseType = "$project.release_type"
|
||||
changelog = releaseChangelog()
|
||||
gameVersions = []
|
||||
gameLoaders = ["neoforge"]
|
||||
mainPublication remapJar
|
||||
relations {
|
||||
depends {
|
||||
curseforge = "midnightlib"
|
||||
modrinth = "midnightlib"
|
||||
}
|
||||
}
|
||||
|
||||
var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN")
|
||||
if (CURSEFORGE_TOKEN != null) {
|
||||
curseforge {
|
||||
token = CURSEFORGE_TOKEN
|
||||
id = rootProject.curseforge_id
|
||||
gameVersions.addAll "Java 21", project.minecraft_version
|
||||
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||
}
|
||||
}
|
||||
|
||||
var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN")
|
||||
if (MODRINTH_TOKEN != null) {
|
||||
modrinth {
|
||||
token = MODRINTH_TOKEN
|
||||
id = rootProject.modrinth_id
|
||||
version = "$rootProject.version-$project.name"
|
||||
gameVersions.addAll project.minecraft_version
|
||||
if (project.supported_versions != "") gameVersions.addAll project.supported_versions
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
1
neoforge/gradle.properties
Normal file
1
neoforge/gradle.properties
Normal file
@@ -0,0 +1 @@
|
||||
loom.platform=neoforge
|
||||
@@ -0,0 +1,24 @@
|
||||
package eu.midnightdust.blur.neoforge;
|
||||
|
||||
import eu.midnightdust.blur.Blur;
|
||||
import eu.midnightdust.blur.util.RainbowColor;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.fml.common.Mod;
|
||||
import net.neoforged.neoforge.client.event.ClientTickEvent;
|
||||
|
||||
@Mod(value = Blur.MOD_ID, dist = Dist.CLIENT)
|
||||
public class BlurNeoForge {
|
||||
public BlurNeoForge() {
|
||||
Blur.init();
|
||||
}
|
||||
|
||||
@EventBusSubscriber(modid = Blur.MOD_ID, bus = EventBusSubscriber.Bus.GAME, value = Dist.CLIENT)
|
||||
public static class ClientGameEvents {
|
||||
@SubscribeEvent
|
||||
public static void endClientTick(ClientTickEvent.Post event) {
|
||||
RainbowColor.tick();
|
||||
}
|
||||
}
|
||||
}
|
||||
31
neoforge/src/main/resources/META-INF/neoforge.mods.toml
Normal file
31
neoforge/src/main/resources/META-INF/neoforge.mods.toml
Normal file
@@ -0,0 +1,31 @@
|
||||
modLoader = "javafml"
|
||||
loaderVersion = "[2,)"
|
||||
#issueTrackerURL = ""
|
||||
license = "MIT License"
|
||||
|
||||
[[mods]]
|
||||
modId = "blur"
|
||||
version = "${version}"
|
||||
displayName = "Blur+"
|
||||
logoFile = "blur.png"
|
||||
authors = "Motschen, tterrag1098, Pyrofab, backryun, byquanton"
|
||||
description = '''
|
||||
Various enhancements for the blur effect behind Minecraft GUIs
|
||||
'''
|
||||
|
||||
[[mixins]]
|
||||
config = "blur.mixins.json"
|
||||
|
||||
[[dependencies.blur]]
|
||||
modId = "neoforge"
|
||||
mandatory = true
|
||||
versionRange = "[21.0,)"
|
||||
ordering = "NONE"
|
||||
side = "CLIENT"
|
||||
|
||||
[[dependencies.blur]]
|
||||
modId = "minecraft"
|
||||
mandatory = true
|
||||
versionRange = "[1.21.2,)"
|
||||
ordering = "NONE"
|
||||
side = "CLIENT"
|
||||
BIN
neoforge/src/main/resources/blur.png
Normal file
BIN
neoforge/src/main/resources/blur.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 90 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 63 KiB |
@@ -1,67 +0,0 @@
|
||||
{
|
||||
"targets": [
|
||||
"swap"
|
||||
],
|
||||
"passes": [
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "minecraft:main",
|
||||
"outtarget": "swap",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 1.0, 0.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "swap",
|
||||
"outtarget": "minecraft:main",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 0.0, 1.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "minecraft:main",
|
||||
"outtarget": "swap",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 1.0, 0.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "swap",
|
||||
"outtarget": "minecraft:main",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 0.0, 1.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
{
|
||||
"pack": {
|
||||
"_comment": "This pack was made for Blur version @mod_version@",
|
||||
"pack_format": @pack_version@,
|
||||
"description": "@description@"
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
"ultra_lite": {
|
||||
"name": "Ultra Lite",
|
||||
"radius": 2,
|
||||
"description": "Least passes, weakest effect, greatest performance. It's like having a smudge on your glasses."
|
||||
},
|
||||
"lite": {
|
||||
"name": "Lite",
|
||||
"radius": 8,
|
||||
"description": "Less passes, weaker effect, greater performance."
|
||||
},
|
||||
"strong": {
|
||||
"name": "Strong",
|
||||
"radius": 32,
|
||||
"description" : "More passes, stronger effect, lesser performance."
|
||||
},
|
||||
"ultra_strong": {
|
||||
"name": "Ultra Strong",
|
||||
"radius": 64,
|
||||
"description": "Too many passes, strongest effect, worst performance. It's like having Vaseline in your eyes."
|
||||
}
|
||||
}
|
||||
15
settings.gradle
Normal file
15
settings.gradle
Normal file
@@ -0,0 +1,15 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
maven { url "https://maven.fabricmc.net/" }
|
||||
maven { url "https://maven.architectury.dev/" }
|
||||
maven { url "https://maven.neoforged.net/releases" }
|
||||
gradlePluginPortal()
|
||||
}
|
||||
}
|
||||
|
||||
include("common")
|
||||
include("fabric")
|
||||
include("neoforge")
|
||||
//include("quilt")
|
||||
|
||||
rootProject.name = "blur"
|
||||
@@ -1,168 +0,0 @@
|
||||
package com.tterrag.blur;
|
||||
|
||||
import java.io.File;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
|
||||
import com.google.common.base.Throwables;
|
||||
import com.tterrag.blur.util.ShaderResourcePack;
|
||||
|
||||
import static com.tterrag.blur.Blur.*;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiChat;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.resources.IResourcePack;
|
||||
import net.minecraft.client.resources.SimpleReloadableResourceManager;
|
||||
import net.minecraft.client.shader.Shader;
|
||||
import net.minecraft.client.shader.ShaderGroup;
|
||||
import net.minecraft.client.shader.ShaderUniform;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.client.event.GuiOpenEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.fml.client.event.ConfigChangedEvent.OnConfigChangedEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventHandler;
|
||||
import net.minecraftforge.fml.common.Mod.Instance;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
|
||||
import net.minecraftforge.fml.common.gameevent.TickEvent.RenderTickEvent;
|
||||
import net.minecraftforge.fml.relauncher.ReflectionHelper;
|
||||
|
||||
@Mod(modid = MODID, name = MOD_NAME, version = VERSION, acceptedMinecraftVersions = "[1.9, 1.13)", clientSideOnly = true, guiFactory = "com.tterrag.blur.config.BlurGuiFactory")
|
||||
public class Blur {
|
||||
|
||||
public static final String MODID = "blur";
|
||||
public static final String MOD_NAME = "Blur";
|
||||
public static final String VERSION = "@VERSION@";
|
||||
|
||||
@Instance
|
||||
public static Blur instance;
|
||||
|
||||
public Configuration config;
|
||||
|
||||
private String[] blurExclusions;
|
||||
|
||||
private Field _listShaders;
|
||||
private long start;
|
||||
private int fadeTime;
|
||||
|
||||
public int radius; // Store default so we don't trigger an extra reload
|
||||
private int colorFirst, colorSecond;
|
||||
|
||||
@Nonnull
|
||||
private ShaderResourcePack dummyPack = new ShaderResourcePack();
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public Blur() {
|
||||
((List<IResourcePack>)ReflectionHelper.getPrivateValue(Minecraft.class, Minecraft.getMinecraft(), "field_110449_ao", "defaultResourcePacks")).add(dummyPack);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
|
||||
// Add our dummy resourcepack
|
||||
((SimpleReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(dummyPack);
|
||||
|
||||
config = new Configuration(new File(event.getModConfigurationDirectory(), "blur.cfg"));
|
||||
saveConfig();
|
||||
}
|
||||
|
||||
private void saveConfig() {
|
||||
|
||||
blurExclusions = config.getStringList("guiExclusions", Configuration.CATEGORY_GENERAL, new String[] {
|
||||
GuiChat.class.getName(),
|
||||
}, "A list of classes to be excluded from the blur shader.");
|
||||
|
||||
fadeTime = config.getInt("fadeTime", Configuration.CATEGORY_GENERAL, 200, 0, Integer.MAX_VALUE, "The time it takes for the blur to fade in, in ms.");
|
||||
|
||||
int r = config.getInt("radius", Configuration.CATEGORY_GENERAL, 12, 1, 100, "The radius of the blur effect. This controls how \"strong\" the blur is.");
|
||||
if (r != radius) {
|
||||
radius = r;
|
||||
dummyPack.onResourceManagerReload(Minecraft.getMinecraft().getResourceManager());
|
||||
if (Minecraft.getMinecraft().world != null) {
|
||||
Minecraft.getMinecraft().entityRenderer.stopUseShader();
|
||||
}
|
||||
}
|
||||
|
||||
colorFirst = Integer.parseUnsignedInt(
|
||||
config.getString("gradientStartColor", Configuration.CATEGORY_GENERAL, "75000000", "The start color of the background gradient. Given in ARGB hex."),
|
||||
16
|
||||
);
|
||||
|
||||
colorSecond = Integer.parseUnsignedInt(
|
||||
config.getString("gradientEndColor", Configuration.CATEGORY_GENERAL, "75000000", "The end color of the background gradient. Given in ARGB hex."),
|
||||
16
|
||||
);
|
||||
|
||||
config.save();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onConfigChanged(OnConfigChangedEvent event) {
|
||||
if (event.getModID().equals(MODID)) {
|
||||
saveConfig();
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onGuiChange(GuiOpenEvent event) {
|
||||
if (_listShaders == null) {
|
||||
_listShaders = ReflectionHelper.findField(ShaderGroup.class, "field_148031_d", "listShaders");
|
||||
}
|
||||
if (Minecraft.getMinecraft().world != null) {
|
||||
EntityRenderer er = Minecraft.getMinecraft().entityRenderer;
|
||||
boolean excluded = event.getGui() == null || ArrayUtils.contains(blurExclusions, event.getGui().getClass().getName());
|
||||
if (!er.isShaderActive() && !excluded) {
|
||||
er.loadShader(new ResourceLocation("shaders/post/fade_in_blur.json"));
|
||||
start = System.currentTimeMillis();
|
||||
} else if (er.isShaderActive() && excluded) {
|
||||
er.stopUseShader();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private float getProgress() {
|
||||
return Math.min((System.currentTimeMillis() - start) / (float) fadeTime, 1);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onRenderTick(RenderTickEvent event) {
|
||||
if (event.phase == Phase.END && Minecraft.getMinecraft().currentScreen != null && Minecraft.getMinecraft().entityRenderer.isShaderActive()) {
|
||||
ShaderGroup sg = Minecraft.getMinecraft().entityRenderer.getShaderGroup();
|
||||
try {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Shader> shaders = (List<Shader>) _listShaders.get(sg);
|
||||
for (Shader s : shaders) {
|
||||
ShaderUniform su = s.getShaderManager().getShaderUniform("Progress");
|
||||
if (su != null) {
|
||||
su.set(getProgress());
|
||||
}
|
||||
}
|
||||
} catch (IllegalArgumentException | IllegalAccessException e) {
|
||||
Throwables.propagate(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static int getBackgroundColor(boolean second) {
|
||||
int color = second ? instance.colorSecond : instance.colorFirst;
|
||||
int a = color >>> 24;
|
||||
int r = (color >> 16) & 0xFF;
|
||||
int b = (color >> 8) & 0xFF;
|
||||
int g = color & 0xFF;
|
||||
float prog = instance.getProgress();
|
||||
a *= prog;
|
||||
r *= prog;
|
||||
g *= prog;
|
||||
b *= prog;
|
||||
return a << 24 | r << 16 | b << 8 | g;
|
||||
}
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
package com.tterrag.blur;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
|
||||
|
||||
@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE)
|
||||
public class BlurPlugin implements IFMLLoadingPlugin {
|
||||
|
||||
@Override
|
||||
public String[] getASMTransformerClass() {
|
||||
return new String[] { "com.tterrag.blur.BlurTransformer" };
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModContainerClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSetupClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectData(Map<String, Object> data) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAccessTransformerClass() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
package com.tterrag.blur;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
|
||||
public class BlurTransformer implements IClassTransformer {
|
||||
|
||||
private static final String GUI_SCREEN_CLASS_NAME = "net.minecraft.client.gui.GuiScreen";
|
||||
|
||||
private static final String DRAW_WORLD_BAGKGROUND_METHOD = "drawWorldBackground";
|
||||
private static final String DRAW_WORLD_BAGKGROUND_METHOD_OBF = "func_146270_b";
|
||||
|
||||
private static final String BLUR_MAIN_CLASS = "com/tterrag/blur/Blur";
|
||||
private static final String COLOR_HOOK_METHOD_NAME = "getBackgroundColor";
|
||||
private static final String COLOR_HOOK_METHOD_DESC = "(Z)I";
|
||||
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if (transformedName.equals(GUI_SCREEN_CLASS_NAME)) {
|
||||
System.out.println("Transforming Class [" + transformedName + "], Method [" + DRAW_WORLD_BAGKGROUND_METHOD + "]");
|
||||
|
||||
ClassNode classNode = new ClassNode();
|
||||
ClassReader classReader = new ClassReader(basicClass);
|
||||
classReader.accept(classNode, 0);
|
||||
|
||||
Iterator<MethodNode> methods = classNode.methods.iterator();
|
||||
|
||||
while (methods.hasNext()) {
|
||||
MethodNode m = methods.next();
|
||||
if (m.name.equals(DRAW_WORLD_BAGKGROUND_METHOD) || m.name.equals(DRAW_WORLD_BAGKGROUND_METHOD_OBF)) {
|
||||
for (int i = 0; i < m.instructions.size(); i++) {
|
||||
AbstractInsnNode next = m.instructions.get(i);
|
||||
|
||||
// if (next.getOpcode() == Opcodes.INVOKEVIRTUAL && ((MethodInsnNode)next).name.equals(DRAW_GRADIENT_RECT_METHOD_NAME)) {
|
||||
// while (!(next instanceof LabelNode)) {
|
||||
// m.instructions.remove(next);
|
||||
// next = m.instructions.get(--i);
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
if (next.getOpcode() == Opcodes.LDC) {
|
||||
System.out.println("Modifying GUI background darkness... ");
|
||||
AbstractInsnNode colorHook = new MethodInsnNode(Opcodes.INVOKESTATIC, BLUR_MAIN_CLASS, COLOR_HOOK_METHOD_NAME, COLOR_HOOK_METHOD_DESC, false);
|
||||
AbstractInsnNode colorHook2 = colorHook.clone(null);
|
||||
|
||||
// Replace LDC with hooks
|
||||
m.instructions.set(next, colorHook);
|
||||
m.instructions.set(colorHook.getNext(), colorHook2);
|
||||
|
||||
// Load boolean constants for method param
|
||||
m.instructions.insertBefore(colorHook, new InsnNode(Opcodes.ICONST_1));
|
||||
m.instructions.insertBefore(colorHook2, new InsnNode(Opcodes.ICONST_0));
|
||||
break;
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
classNode.accept(cw);
|
||||
System.out.println("Transforming " + transformedName + " Finished.");
|
||||
return cw.toByteArray();
|
||||
}
|
||||
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
package com.tterrag.blur.config;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import com.tterrag.blur.Blur;
|
||||
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraftforge.common.config.ConfigElement;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
import net.minecraftforge.fml.client.config.GuiConfig;
|
||||
import net.minecraftforge.fml.client.config.GuiConfigEntries;
|
||||
|
||||
public class BlurConfigGui extends GuiConfig {
|
||||
|
||||
public BlurConfigGui(GuiScreen parentScreen) {
|
||||
super(parentScreen, new ConfigElement(Blur.instance.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), Blur.MODID, false, false, I18n.format(Blur.MODID + ".config.title"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initGui() {
|
||||
if (this.entryList == null || this.needsRefresh)
|
||||
{
|
||||
this.entryList = new GuiConfigEntries(this, mc) {
|
||||
@SuppressWarnings({ "unused", "null" })
|
||||
@Override
|
||||
protected void drawContainerBackground(@Nonnull Tessellator tessellator) {
|
||||
if (mc.world == null) {
|
||||
super.drawContainerBackground(tessellator);
|
||||
}
|
||||
}
|
||||
};
|
||||
this.needsRefresh = false;
|
||||
}
|
||||
super.initGui();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawDefaultBackground() {
|
||||
drawWorldBackground(0);
|
||||
}
|
||||
}
|
||||
@@ -1,41 +0,0 @@
|
||||
package com.tterrag.blur.config;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraftforge.fml.client.IModGuiFactory;
|
||||
|
||||
public class BlurGuiFactory implements IModGuiFactory {
|
||||
|
||||
@Override
|
||||
public void initialize(Minecraft minecraftInstance) {}
|
||||
|
||||
@Override
|
||||
public Class<? extends GuiScreen> mainConfigGuiClass() {
|
||||
return BlurConfigGui.class;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public RuntimeOptionGuiHandler getHandlerFor(RuntimeOptionCategoryElement element) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 1.12
|
||||
// @Override
|
||||
public boolean hasConfigGui() {
|
||||
return true;
|
||||
}
|
||||
|
||||
// 1.12
|
||||
// @Override
|
||||
public GuiScreen createConfigGui(GuiScreen parentScreen) {
|
||||
return new BlurConfigGui(parentScreen);
|
||||
}
|
||||
}
|
||||
@@ -1,89 +0,0 @@
|
||||
package com.tterrag.blur.util;
|
||||
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Scanner;
|
||||
import java.util.Set;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
import com.tterrag.blur.Blur;
|
||||
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.client.resources.IResourceManagerReloadListener;
|
||||
import net.minecraft.client.resources.IResourcePack;
|
||||
import net.minecraft.client.resources.data.IMetadataSection;
|
||||
import net.minecraft.client.resources.data.MetadataSerializer;
|
||||
import net.minecraft.client.resources.data.PackMetadataSection;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.text.TextComponentString;
|
||||
|
||||
public class ShaderResourcePack implements IResourcePack, IResourceManagerReloadListener {
|
||||
|
||||
protected boolean validPath(ResourceLocation location) {
|
||||
return location.getResourceDomain().equals("minecraft") && location.getResourcePath().startsWith("shaders/");
|
||||
}
|
||||
|
||||
private final Map<ResourceLocation, String> loadedData = new HashMap<>();
|
||||
|
||||
@Override
|
||||
public InputStream getInputStream(ResourceLocation location) throws IOException {
|
||||
if (validPath(location)) {
|
||||
String s = loadedData.computeIfAbsent(location, loc -> {
|
||||
InputStream in = Blur.class.getResourceAsStream("/" + location.getResourcePath());
|
||||
StringBuilder data = new StringBuilder();
|
||||
Scanner scan = new Scanner(in);
|
||||
try {
|
||||
while (scan.hasNextLine()) {
|
||||
data.append(scan.nextLine().replaceAll("@radius@", Integer.toString(Blur.instance.radius))).append('\n');
|
||||
}
|
||||
} finally {
|
||||
scan.close();
|
||||
}
|
||||
return data.toString();
|
||||
});
|
||||
|
||||
return new ByteArrayInputStream(s.getBytes());
|
||||
}
|
||||
throw new FileNotFoundException(location.toString());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean resourceExists(ResourceLocation location) {
|
||||
return validPath(location) && Blur.class.getResource("/" + location.getResourcePath()) != null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<String> getResourceDomains() {
|
||||
return ImmutableSet.of("minecraft");
|
||||
}
|
||||
|
||||
@SuppressWarnings({ "unchecked", "null" })
|
||||
@Override
|
||||
public <T extends IMetadataSection> T getPackMetadata(MetadataSerializer metadataSerializer, String metadataSectionName) throws IOException {
|
||||
if ("pack".equals(metadataSectionName)) {
|
||||
return (T) new PackMetadataSection(new TextComponentString("Blur's default shaders"), 3);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BufferedImage getPackImage() throws IOException {
|
||||
throw new FileNotFoundException("pack.png");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPackName() {
|
||||
return "Blur dummy resource pack";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onResourceManagerReload(IResourceManager resourceManager) {
|
||||
loadedData.clear();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1 +0,0 @@
|
||||
blur.config.title=Blur Config
|
||||
@@ -1,16 +0,0 @@
|
||||
[
|
||||
{
|
||||
"modid": "blur",
|
||||
"name": "Blur",
|
||||
"description": "Adds a blurry background when viewing GUIs",
|
||||
"version": "${version}",
|
||||
"mcversion": "${mcversion}",
|
||||
"url": "http://tterrag.com",
|
||||
"updateUrl": "http://ci.tterrag.com/job/BlurBG",
|
||||
"authorList": ["tterrag"],
|
||||
"credits": "",
|
||||
"logoFile": "",
|
||||
"screenshots": [],
|
||||
"dependencies": []
|
||||
}
|
||||
]
|
||||
@@ -1,67 +0,0 @@
|
||||
{
|
||||
"targets": [
|
||||
"swap"
|
||||
],
|
||||
"passes": [
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "minecraft:main",
|
||||
"outtarget": "swap",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 1.0, 0.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "swap",
|
||||
"outtarget": "minecraft:main",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 0.0, 1.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "minecraft:main",
|
||||
"outtarget": "swap",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 1.0, 0.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "fade_in_blur",
|
||||
"intarget": "swap",
|
||||
"outtarget": "minecraft:main",
|
||||
"uniforms": [
|
||||
{
|
||||
"name": "BlurDir",
|
||||
"values": [ 0.0, 1.0 ]
|
||||
},
|
||||
{
|
||||
"name": "Radius",
|
||||
"values": [ @radius@.0 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
#version 120
|
||||
|
||||
uniform sampler2D DiffuseSampler;
|
||||
|
||||
varying vec2 texCoord;
|
||||
varying vec2 oneTexel;
|
||||
|
||||
uniform vec2 InSize;
|
||||
|
||||
uniform vec2 BlurDir;
|
||||
uniform float Radius;
|
||||
uniform float Progress;
|
||||
|
||||
void main() {
|
||||
vec4 blurred = vec4(0.0);
|
||||
float totalStrength = 0.0;
|
||||
float totalAlpha = 0.0;
|
||||
float totalSamples = 0.0;
|
||||
float progRadius = floor(Radius * Progress);
|
||||
for(float r = -progRadius; r <= progRadius; r += 1.0) {
|
||||
vec4 sample = texture2D(DiffuseSampler, texCoord + oneTexel * r * BlurDir);
|
||||
|
||||
// Accumulate average alpha
|
||||
totalAlpha = totalAlpha + sample.a;
|
||||
totalSamples = totalSamples + 1.0;
|
||||
|
||||
// Accumulate smoothed blur
|
||||
float strength = 1.0 - abs(r / progRadius);
|
||||
totalStrength = totalStrength + strength;
|
||||
blurred = blurred + sample;
|
||||
}
|
||||
gl_FragColor = vec4(blurred.rgb / (progRadius * 2.0 + 1.0), totalAlpha);
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"blend": {
|
||||
"func": "add",
|
||||
"srcrgb": "one",
|
||||
"dstrgb": "zero"
|
||||
},
|
||||
"vertex": "sobel",
|
||||
"fragment": "fade_in_blur",
|
||||
"attributes": [ "Position" ],
|
||||
"samplers": [
|
||||
{ "name": "DiffuseSampler" }
|
||||
],
|
||||
"uniforms": [
|
||||
{ "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
|
||||
{ "name": "InSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] },
|
||||
{ "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] },
|
||||
{ "name": "BlurDir", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] },
|
||||
{ "name": "Radius", "type": "float", "count": 1, "values": [ 5.0 ] },
|
||||
{ "name": "Progress", "type": "float", "count": 1, "values": [ 0.0 ] }
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user