File tree Expand file tree Collapse file tree 2 files changed +14
-11
lines changed
src/main/java/com/falsepattern/falsetweaks Expand file tree Collapse file tree 2 files changed +14
-11
lines changed Original file line number Diff line number Diff line change @@ -66,10 +66,6 @@ private static void builtinMod(String modname) {
66
66
67
67
@ Mod .EventHandler
68
68
public void preInit (FMLPreInitializationEvent e ) {
69
- proxy .preInit (e );
70
- if (Loader .isModLoaded ("angelica" ) && ModuleConfig .THREADED_CHUNK_UPDATES ()) {
71
- createSidedException ("FalseTweaks threaded rendering is not compatible with Angelica.\n Please disable it in the FalseTweaks config." );
72
- }
73
69
if (Loader .isModLoaded ("animfix" )) {
74
70
builtinMod ("animfix" );
75
71
}
@@ -79,12 +75,7 @@ public void preInit(FMLPreInitializationEvent e) {
79
75
if (Loader .isModLoaded ("DynamicLights" )) {
80
76
createSidedException ("Remove the DynamicLights mod and restart the game!\n FalseTweaks has built-in dynamic lights support." );
81
77
}
82
- if (ModuleConfig .TEXTURE_OPTIMIZATIONS && Compat .isSTBIStitcher ()) {
83
- createSidedException ("FalseTweaks " +
84
- EnumChatFormatting .BOLD + "textureOptimizations" + EnumChatFormatting .RESET + " is not compatible with LWJGL3Ify's " +
85
- EnumChatFormatting .BOLD + "stbiTextureStitching" + EnumChatFormatting .RESET +
86
- " option.\n Disable stbiTextureStitching in the lwjgl3ify.cfg\n or disable textureOptimizations in FalseTweaks!" );
87
- }
78
+ proxy .preInit (e );
88
79
}
89
80
90
81
@ Mod .EventHandler
@@ -102,7 +93,7 @@ public void loadComplete(FMLLoadCompleteEvent e) {
102
93
proxy .loadComplete (e );
103
94
}
104
95
105
- private static void createSidedException (String text ) {
96
+ public static void createSidedException (String text ) {
106
97
if (FMLLaunchHandler .side ().isClient ()) {
107
98
throw ClientHelper .createException (text );
108
99
} else {
Original file line number Diff line number Diff line change 44
44
import net .minecraft .client .Minecraft ;
45
45
import net .minecraft .client .resources .IReloadableResourceManager ;
46
46
import net .minecraft .client .settings .GameSettings ;
47
+ import net .minecraft .util .EnumChatFormatting ;
47
48
import net .minecraftforge .client .ClientCommandHandler ;
48
49
import cpw .mods .fml .client .event .ConfigChangedEvent ;
49
50
import cpw .mods .fml .common .FMLCommonHandler ;
55
56
import cpw .mods .fml .common .eventhandler .SubscribeEvent ;
56
57
import cpw .mods .fml .common .gameevent .TickEvent ;
57
58
59
+ import static com .falsepattern .falsetweaks .FalseTweaks .createSidedException ;
60
+
58
61
@ SuppressWarnings ("unused" )
59
62
public class ClientProxy extends CommonProxy {
60
63
public static boolean clippingHelperShouldInit = true ;
61
64
62
65
@ Override
63
66
public void preInit (FMLPreInitializationEvent e ) {
64
67
super .preInit (e );
68
+ if (Loader .isModLoaded ("angelica" ) && ModuleConfig .THREADED_CHUNK_UPDATES ()) {
69
+ createSidedException ("FalseTweaks threaded rendering is not compatible with Angelica.\n Please disable it in the FalseTweaks config." );
70
+ }
71
+ if (ModuleConfig .TEXTURE_OPTIMIZATIONS && Compat .isSTBIStitcher ()) {
72
+ createSidedException ("FalseTweaks " +
73
+ EnumChatFormatting .BOLD + "textureOptimizations" + EnumChatFormatting .RESET + " is not compatible with LWJGL3Ify's " +
74
+ EnumChatFormatting .BOLD + "stbiTextureStitching" + EnumChatFormatting .RESET +
75
+ " option.\n Disable stbiTextureStitching in the lwjgl3ify.cfg\n or disable textureOptimizations in FalseTweaks!" );
76
+ }
65
77
FMLCommonHandler .instance ().registerCrashCallable (new ICrashCallable () {
66
78
@ Override
67
79
public String getLabel () {
You can’t perform that action at this time.
0 commit comments