mirror of
https://github.com/Motschen/Blur.git
synced 2025-12-15 19:25:09 +01:00
Blur 2.3.0 - Update to MidnightLib v0.2.5
Add live config preview Russian translations by @Felix14-v2 Brazilian translations by @Percario
This commit is contained in:
12
build.gradle
Normal file → Executable file
12
build.gradle
Normal file → Executable file
@@ -19,11 +19,8 @@ repositories {
|
|||||||
includeGroupByRegex 'io\\.github\\.onyxstudios.*'
|
includeGroupByRegex 'io\\.github\\.onyxstudios.*'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
maven {
|
flatDir {
|
||||||
url = 'https://maven.terraformersmc.com/releases'
|
dirs 'local_maven'
|
||||||
content {
|
|
||||||
includeGroup 'com.terraformersmc'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,10 +32,9 @@ dependencies {
|
|||||||
modImplementation "io.github.ladysnake:satin:${satin_version}"
|
modImplementation "io.github.ladysnake:satin:${satin_version}"
|
||||||
include "io.github.ladysnake:satin:${satin_version}"
|
include "io.github.ladysnake:satin:${satin_version}"
|
||||||
|
|
||||||
modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
|
|
||||||
modRuntime "com.terraformersmc:modmenu:${project.modmenu_version}"
|
|
||||||
|
|
||||||
implementation 'com.google.code.findbugs:jsr305:3.0.2'
|
implementation 'com.google.code.findbugs:jsr305:3.0.2'
|
||||||
|
modImplementation "eu.midnightdust:midnightlib:${midnightlib_version}"
|
||||||
|
include "eu.midnightdust:midnightlib:${midnightlib_version}"
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
|
|||||||
12
gradle.properties
Normal file → Executable file
12
gradle.properties
Normal file → Executable file
@@ -3,17 +3,17 @@ org.gradle.jvmargs=-Xmx1G
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/use
|
# check these on https://fabricmc.net/use
|
||||||
minecraft_version=1.17
|
minecraft_version=1.17.1
|
||||||
yarn_mappings=1.17+build.13
|
yarn_mappings=1.17.1+build.61
|
||||||
loader_version=0.11.6
|
loader_version=0.11.7
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version = 2.2.1-1.17+fabric
|
mod_version = 2.3.0-1.17+fabric
|
||||||
maven_group = com.tterrag.blur
|
maven_group = com.tterrag.blur
|
||||||
archives_base_name = Blur
|
archives_base_name = Blur
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
|
||||||
fabric_version = 0.38.0+1.17
|
fabric_version=0.40.1+1.17
|
||||||
modmenu_version = 2.0.4
|
|
||||||
satin_version = 1.6.4
|
satin_version = 1.6.4
|
||||||
|
midnightlib_version=0.2.5
|
||||||
|
|||||||
BIN
local_maven/midnightlib-0.2.5.jar
Executable file
BIN
local_maven/midnightlib-0.2.5.jar
Executable file
Binary file not shown.
4
src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java
Normal file → Executable file
4
src/main/java/com/tterrag/blur/mixin/MixinMinecraftClient.java
Normal file → Executable file
@@ -4,19 +4,17 @@ import org.objectweb.asm.Opcodes;
|
|||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.At.Shift;
|
|
||||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
import com.tterrag.blur.Blur;
|
import com.tterrag.blur.Blur;
|
||||||
|
|
||||||
import net.minecraft.client.MinecraftClient;
|
import net.minecraft.client.MinecraftClient;
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
import net.minecraft.resource.ReloadableResourceManager;
|
|
||||||
|
|
||||||
@Mixin(MinecraftClient.class)
|
@Mixin(MinecraftClient.class)
|
||||||
public class MixinMinecraftClient {
|
public class MixinMinecraftClient {
|
||||||
|
|
||||||
@Inject(method = "openScreen",
|
@Inject(method = "setScreen",
|
||||||
at = @At(value = "FIELD",
|
at = @At(value = "FIELD",
|
||||||
target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
|
target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;",
|
||||||
opcode = Opcodes.PUTFIELD))
|
opcode = Opcodes.PUTFIELD))
|
||||||
|
|||||||
20
src/main/java/com/tterrag/blur/mixin/MixinScreen.java
Normal file → Executable file
20
src/main/java/com/tterrag/blur/mixin/MixinScreen.java
Normal file → Executable file
@@ -1,15 +1,33 @@
|
|||||||
package com.tterrag.blur.mixin;
|
package com.tterrag.blur.mixin;
|
||||||
|
|
||||||
|
import net.minecraft.client.MinecraftClient;
|
||||||
|
import net.minecraft.client.util.math.MatrixStack;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
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.Constant;
|
import org.spongepowered.asm.mixin.injection.Constant;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
import org.spongepowered.asm.mixin.injection.ModifyConstant;
|
||||||
|
|
||||||
import com.tterrag.blur.Blur;
|
import com.tterrag.blur.Blur;
|
||||||
|
|
||||||
import net.minecraft.client.gui.screen.Screen;
|
import net.minecraft.client.gui.screen.Screen;
|
||||||
|
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
@Mixin(Screen.class)
|
@Mixin(Screen.class)
|
||||||
public class MixinScreen {
|
public abstract class MixinScreen {
|
||||||
|
|
||||||
|
@Shadow @Nullable protected MinecraftClient client;
|
||||||
|
|
||||||
|
@Inject(at = @At("HEAD"), method = "render")
|
||||||
|
private void reloadShader(MatrixStack matrixStack, int i, int j, float f, CallbackInfo ci) {
|
||||||
|
if (this.getClass().toString().toLowerCase(Locale.ROOT).contains("midnight") && this.client != null) {
|
||||||
|
Blur.INSTANCE.onScreenChange(this.client.currentScreen);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ModifyConstant(
|
@ModifyConstant(
|
||||||
method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
|
method = "renderBackground(Lnet/minecraft/client/util/math/MatrixStack;I)V",
|
||||||
|
|||||||
2
src/main/resources/assets/blur/lang/en_us.json
Normal file → Executable file
2
src/main/resources/assets/blur/lang/en_us.json
Normal file → Executable file
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"blur.midnightconfig.title": "Blur Config",
|
"blur.midnightconfig.title": "Blur Config",
|
||||||
"blur.midnightconfig.blurExclusions": "Blur Exclusions are currently not configurable in-game!",
|
"blur.midnightconfig.blurExclusions": "§cBlur Exclusions are currently not configurable in-game!",
|
||||||
"blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
|
"blur.midnightconfig.fadeTimeMillis": "Fade Time (in milliseconds)",
|
||||||
"blur.midnightconfig.radius": "Radius",
|
"blur.midnightconfig.radius": "Radius",
|
||||||
"blur.midnightconfig.gradientStartColor": "Gradient Start Color",
|
"blur.midnightconfig.gradientStartColor": "Gradient Start Color",
|
||||||
|
|||||||
3
src/main/resources/fabric.mod.json
Normal file → Executable file
3
src/main/resources/fabric.mod.json
Normal file → Executable file
@@ -9,9 +9,6 @@
|
|||||||
"entrypoints": {
|
"entrypoints": {
|
||||||
"client": [
|
"client": [
|
||||||
"com.tterrag.blur.Blur::INSTANCE"
|
"com.tterrag.blur.Blur::INSTANCE"
|
||||||
],
|
|
||||||
"modmenu": [
|
|
||||||
"com.tterrag.blur.config.ModMenuIntegration"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"contact": {
|
"contact": {
|
||||||
|
|||||||
Reference in New Issue
Block a user