Skip to content

Commit

Permalink
fix: finish mappings update
Browse files Browse the repository at this point in the history
justin you silly guy
  • Loading branch information
KingContaria committed Jul 15, 2024
1 parent 7d54503 commit 1bba0b0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public void set(GameOptions options, Integer value) {
// see Option.GRAPHICS's setter
options.graphicsMode = GraphicsMode.byId(value);
if (!(options instanceof StandardGameOptions)) {
if (options.graphicsMode == GraphicsMode.FABULOUS && (!GlStateManager.supportsGl30() || MinecraftClient.getInstance().method_30049().method_30142())) {
if (options.graphicsMode == GraphicsMode.FABULOUS && (!GlStateManager.supportsGl30() || MinecraftClient.getInstance().getVideoWarningManager().hasCancelledAfterWarning())) {
StandardSettings.LOGGER.warn("Set Graphics Mode to 'Fancy' because 'Fabulous!' is not supported on this device.");
options.graphicsMode = GraphicsMode.FANCY;
}
Expand Down Expand Up @@ -188,7 +188,7 @@ public boolean hasWidget() {
this.register("chatLineSpacing", "options.chat.title", Option.CHAT_LINE_SPACING);
this.register("chatWidth", "options.chat.title", Option.CHAT_WIDTH);
this.register("chatHeightFocused", "options.chat.title", Option.CHAT_HEIGHT_FOCUSED);
this.register("chatHeightUnfocused", "options.chat.title", Option.SATURATION);
this.register("chatHeightUnfocused", "options.chat.title", Option.CHAT_HEIGHT_UNFOCUSED);
this.register("narrator", "options.chat.title", Option.NARRATOR, options -> options.narrator.getId());
this.register("autoSuggestions", "options.chat.title", Option.AUTO_SUGGESTIONS);
this.register("reducedDebugInfo", "options.chat.title", Option.REDUCED_DEBUG_INFO);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ public abstract class MinecraftClientMixin {
@Shadow
public abstract void openPauseMenu(boolean pause);

@Inject(method = "method_29607", at = @At("HEAD"))
@Inject(method = "createWorld", at = @At("HEAD"))
private void reset(String worldName, LevelInfo levelInfo, RegistryTracker.Modifiable registryTracker, GeneratorOptions generatorOptions, CallbackInfo ci) {
StandardSettings.createCache();
if (StandardSettings.isEnabled()) {
StandardSettings.reset();
}
}

@Inject(method = "method_29607", at = @At("TAIL"))
@Inject(method = "createWorld", at = @At("TAIL"))
private void onWorldJoin(String worldName, LevelInfo levelInfo, RegistryTracker.Modifiable registryTracker, GeneratorOptions generatorOptions, CallbackInfo ci) {
StandardSettings.saveToWorldFile(worldName);
if (StandardSettings.isEnabled()) {
Expand Down

0 comments on commit 1bba0b0

Please sign in to comment.