Skip to content

Commit 5efb809

Browse files
committed
Merge remote-tracking branch 'main/v1' into v1
2 parents da93a1c + dad6825 commit 5efb809

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ copycat = "0.1.3"
2020
copycat-image-awt = "0.1.1"
2121

2222
# Per version
23-
textile = "0.8.0"
23+
textile = "0.9.0"
2424
omnicore = "0.21.0"
2525
lwjgl = "3.3.3" # All downloaded by the isolated-lwjgl3-loader
2626

minecraft/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/BlurHandler.java

+7
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ private boolean reloadBlur(Object gui) {
101101
// a one of ours, we should load our own blur!
102102
if (gui instanceof BlurScreen && ((BlurScreen) gui).hasBackgroundBlur()) {
103103
if (!isShaderActive()) {
104+
//#if MC >= 1.21.4
105+
//$$ if (true) return false;
106+
//#endif
107+
104108
//#if FABRIC
105109
//$$ ((org.polyfrost.oneconfig.internal.mixin.fabric.Mixin_LoadShaderInvoker_Fabric) MinecraftClient.getInstance().gameRenderer).invokeLoadShader(this.blurShader);
106110
//#else
@@ -174,6 +178,9 @@ public boolean isShaderActive() {
174178
}
175179

176180
private ShaderGroup getShaderGroup() {
181+
//#if MC >= 1.21.4
182+
//$$ if (true) return null;
183+
//#endif
177184
return Minecraft.getMinecraft()
178185
//#if MC >= 1.21.4
179186
//$$ .getShaderLoader().loadPostEffect(this.blurShader, DefaultFramebufferSet.MAIN_ONLY);

minecraft/src/main/java/org/polyfrost/oneconfig/internal/OneConfig.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -139,22 +139,22 @@ private static void registerCommands() {
139139
OneConfigUI.INSTANCE.open();
140140
return 1;
141141
});
142-
b.then(literal("updateCheck").executes(cmd -> {
143-
Multithreading.submit(() -> OmniChat.showChatMessage(MavenUpdateChecker.oneconfig().hasUpdate() ? "Update available!" : "No updates available"));
142+
b.then(literal("updateCheck").executes(ctx -> {
143+
Multithreading.submit(() -> ctx.getSource().showMessage(MavenUpdateChecker.oneconfig().hasUpdate() ? "Update available!" : "No updates available"));
144144
return 1;
145145
}));
146-
b.then(literal("locraw").executes(cmd -> {
147-
cmd.getSource().showMessage(HypixelUtils.getLocation().toString());
146+
b.then(literal("locraw").executes(ctx -> {
147+
ctx.getSource().showMessage(HypixelUtils.getLocation().toString());
148148
return 1;
149149
}));
150-
b.then(literal("hud").executes(cmd -> {
150+
b.then(literal("hud").executes(ctx -> {
151151
Platform.screen().display(HudManager.INSTANCE.getWithEditor());
152152
return 1;
153153
}));
154-
b.then(literal("delete").executes(cmd -> {
154+
b.then(literal("delete").executes(ctx -> {
155155
OneConfigUI.INSTANCE.invalidateCache();
156156
ConfigVisualizer.INSTANCE.clearCache();
157-
cmd.getSource().showMessage("Deleted OneConfig UI. Please make a report if you were having issues!");
157+
ctx.getSource().showMessage("Deleted OneConfig UI. Please make a report if you were having issues!");
158158
return 1;
159159
}));
160160

0 commit comments

Comments
 (0)