Skip to content

Commit 10f8dc5

Browse files
committed
fix startup errors
1 parent f33c6b9 commit 10f8dc5

5 files changed

Lines changed: 9 additions & 11 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ dgt.minecraft.revision=5
1515
# Project Configuration
1616
project.group=org.polyfrost.oneconfig
1717
project.name=OneConfig
18-
project.version=1.0.0-alpha.181
18+
project.version=1.0.0-alpha.182

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ public final class BlurHandler {
7171

7272
private BlurHandler() {
7373
EventHandler.ofRemoving(ScreenOpenEvent.class, e -> reloadBlur(e.getScreen())).register();
74+
//#if MC <= 1.21.5
7475
EventManager.register(TickEvent.End.class, () -> {
7576
if (su == null) return;
76-
//#if MC <= 1.21.5
7777
su.set(animation.update(50_000_000L)); // TODO: Find GlUniform.set alternative. Blur isnt cinfigured to work anyways with 1.21.5 anyways
78-
//#endif
7978
});
79+
//#endif
8080
}
8181

8282
public static void init() {
@@ -195,7 +195,7 @@ public boolean isShaderActive() {
195195

196196
private ShaderGroup getShaderGroup() {
197197
//#if MC >= 1.21.2
198-
//$$ if (true) return null;
198+
//$$ return null;
199199
//#endif
200200
return Minecraft.getMinecraft()
201201
//#if MC >= 1.21.2

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ public List<String> getMixins() {
8383

8484
//#if FORGE
8585
mixins.add("events.Mixin_ChatReceiveEvent_Forge");
86+
mixins.add("events.Mixin_ScreenOpenEvent_Forge");
8687
//#if MC < 1.13
8788
mixins.add("compat.Mixin_LegacyOneConfigCarryover");
8889
mixins.add("compat.Mixin_OverwriteLegacyCommand");
@@ -92,8 +93,11 @@ public List<String> getMixins() {
9293
mixins.add("hidpi.Mixin_FixLoadingScreenHiDPI");
9394
//#endif
9495
//#else
96+
//#if MC < 1.21.2
9597
//$$ mixins.add("fabric.Mixin_LoadShaderInvoker_Fabric");
98+
//#endif
9699
//$$ mixins.add("fabric.Mixin_ChatReceiveEvent_Fabric");
100+
//$$ mixins.add("events.Mixin_ScreenOpenEvent_Fabric");
97101
//#endif
98102

99103
//#if MC >= 1.16

minecraft/src/main/resources/mixins.oneconfigv1.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
"events.Mixin_RenderEvent",
2626
"events.Mixin_RenderLivingEntityEvent",
2727
"events.Mixin_ResizeEvent",
28-
"events.Mixin_ScreenOpenEvent_Fabric",
29-
"events.Mixin_ScreenOpenEvent_Forge",
3028
"events.Mixin_SendPacketEvent",
3129
"events.Mixin_ServerJoinEvent",
3230
"events.Mixin_ShutdownEvent",

minecraft/versions/1.16.5-fabric/src/main/java/org/polyfrost/oneconfig/internal/mixin/compat/modmenu/Mixin_ModMenu.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package org.polyfrost.oneconfig.internal.mixin.compat.modmenu;
22

3-
// remove the below check once modmenu updates to support 1.21.9
4-
//#if MC < 1.21.9
5-
63
//#if FABRIC
74
import com.terraformersmc.modmenu.ModMenu;
85
import org.polyfrost.oneconfig.internal.compat.ModMenuCompat;
@@ -22,5 +19,4 @@ private static void init(CallbackInfo ci) {
2219
}
2320

2421
}
25-
//#endif
26-
//#endif
22+
//#endif

0 commit comments

Comments
 (0)