Skip to content

Commit

Permalink
Minecraft 1.21.0 backport
Browse files Browse the repository at this point in the history
Signed-off-by: Lilly Rose Berner <[email protected]>
  • Loading branch information
LostLuma committed Dec 3, 2024
1 parent c59f71e commit 1dc9357
Show file tree
Hide file tree
Showing 22 changed files with 97 additions and 160 deletions.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ maven_group = juliand665
archives_name = dynamic-fps

# File naming version
minecraft_version = 1.21.2
minecraft_version = 1.21.0
# Version for publishing
minecraft_version_min = 1.21.2
minecraft_version_max = 1.21.4
minecraft_version_min = 1.21
minecraft_version_max = 1.21.1

enabled_platforms=fabric,forge,neoforge,quilt
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[versions]
minecraft = "1.21.3"
minecraft = "1.21"

# Platform libraries

fabric_loader = "0.15.10"
fabric_api = "0.102.2+1.21.2"
fabric_api = "0.100.1+1.21"

forge = "1.21.3-53.0.7"
forge = "1.21-51.0.33"

neoforge = "21.3.0-beta"
neoforge = "21.0.143"

quilt_loader = "0.25.0"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ private static void checkForStateChanges() {
checkForStateChanges0();
} else {
// Schedule check for the beginning of the next frame
minecraft.schedule(DynamicFPSMod::checkForStateChanges0);
minecraft.tell(DynamicFPSMod::checkForStateChanges0);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static void applyWorkaround() {
// Agrees that the window is focused. The mod is
// A little too fast for this, so we schedule it
// For the next client tick (before next frame).
minecraft.schedule(minecraft.mouseHandler::grabMouse);
minecraft.tell(minecraft.mouseHandler::grabMouse);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@

public enum IdleCondition {
NONE,
VANILLA,
ON_BATTERY;
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,16 @@

import dynamic_fps.impl.util.ResourceLocations;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.gui.components.toasts.Toast;
import net.minecraft.client.gui.components.toasts.ToastManager;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.gui.components.toasts.ToastComponent;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class BaseToast implements Toast {
private long firstRender;
private Visibility visibility;

protected Component title;
protected Component description;
Expand All @@ -28,47 +25,32 @@ protected BaseToast(Component title, Component description, @Nullable ResourceLo
this.description = description;

this.icon = icon;

this.visibility = Visibility.SHOW;
}

@Override
public @NotNull Visibility getWantedVisibility() {
return this.visibility;
}

@Override
public void update(ToastManager toastManager, long currentTime) {
if (this.firstRender == 0) {
return;
}

if (currentTime - this.firstRender >= 5000.0 * toastManager.getNotificationDisplayTimeMultiplier()) {
this.visibility = Visibility.HIDE;
}
}

@Override
public void render(GuiGraphics graphics, Font font, long currentTime) {
public @NotNull Visibility render(GuiGraphics graphics, ToastComponent toastComponent, long currentTime) {
if (this.firstRender == 0) {
this.onFirstRender();
this.firstRender = currentTime;
}

// type, resource, x, y, ?, ?, width, height, width, height
graphics.blit(RenderType::guiTextured, BACKGROUND_IMAGE, 0, 0, 0.0f, 0, this.width(), this.height(), this.width(), this.height());
// resource, x, y, z, ?, ?, width, height, width, height
graphics.blit(BACKGROUND_IMAGE, 0, 0, 0.0f, 0.0f, this.width(), this.height(), this.width(), this.height());

int x = 8;

if (this.icon != null) {
x += 22;

graphics.blit(RenderType::guiTextured, MOD_ICON, 2, 2, 0.0f, 0, 8, 8, 8, 8);
graphics.blit(RenderType::guiTextured, this.icon, 8, 8, 0.0f, 0, 16, 16, 16, 16);
graphics.blit(MOD_ICON, 2, 2, 0.0f, 0.0f, 8, 8, 8, 8);
graphics.blit(this.icon, 8, 8, 0.0f, 0.0f, 16, 16, 16, 16);

}

graphics.drawString(Minecraft.getInstance().font, this.title, x, 7, 0x5f3315, false);
graphics.drawString(Minecraft.getInstance().font, this.description, x, 18, -16777216, false);

return currentTime - this.firstRender >= 5000.0 * toastComponent.getNotificationDisplayTimeMultiplier() ? Toast.Visibility.HIDE : Toast.Visibility.SHOW;
}

public void onFirstRender() {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static void queueToast(Component title, ResourceLocation icon) {
queuedToast.icon = icon;
} else {
queuedToast = new BatteryToast(title, icon);
Minecraft.getInstance().getToastManager().addToast(queuedToast);
Minecraft.getInstance().getToasts().addToast(queuedToast);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ private static void updateState() {
changed = true;

int current = charge;
minecraft.schedule(() -> DynamicFPSMod.onBatteryChargeChanged(current, newCharge));
minecraft.tell(() -> DynamicFPSMod.onBatteryChargeChanged(current, newCharge));
}

if (readInitialData && status != newStatus) {
changed = true;

State current = status;
State updated = newStatus;
minecraft.schedule(() -> DynamicFPSMod.onBatteryStatusChanged(current, updated));
minecraft.tell(() -> DynamicFPSMod.onBatteryStatusChanged(current, updated));
}

charge = newCharge;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ private ErrorToast(Component description) {
*/
public static void queueToast(Component description) {
ErrorToast toast = new ErrorToast(description);
Minecraft.getInstance().getToastManager().addToast(toast);
Minecraft.getInstance().getToasts().addToast(toast);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import net.minecraft.client.CloudStatus;
import net.minecraft.client.GraphicsStatus;
import net.minecraft.client.Options;
import net.minecraft.server.level.ParticleStatus;
import net.minecraft.client.ParticleStatus;

/*
* Helper for saving, overriding, and re-applying vanilla options.
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
public class MinecraftMixin {
@Shadow
@Final
private Window window;
private Window window;

@Shadow
@Final
Expand All @@ -36,4 +36,32 @@ private void setScreen(CallbackInfo callbackInfo) {
IdleHandler.onActivity();
}

/**
* Conditionally bypasses the main menu frame rate limit.
*
* This is done in two cases:
* - The window is active, and the user wants to uncap the frame rate
* - The window is inactive, and the current FPS limit should be lower
*/
@Inject(method = "getFramerateLimit", at = @At(value = "CONSTANT", args = "intValue=60"), cancellable = true)
private void getFramerateLimit(CallbackInfoReturnable<Integer> callbackInfo) {
int limit = this.window.getFramerateLimit();

if (DynamicFPSMod.powerState() != PowerState.FOCUSED) {
// Vanilla returns 60 here
// Only overwrite if our current limit is lower
if (limit < 60) {
callbackInfo.setReturnValue(limit);
}
} else if (DynamicFPSConfig.INSTANCE.uncapMenuFrameRate()) {
if (this.options.enableVsync().get()) {
// VSync will regulate to a non-infinite value
callbackInfo.setReturnValue(Constants.NO_FRAME_RATE_LIMIT);
} else {
// Even though the option "uncaps" the frame rate the limit is 250 FPS.
// Since otherwise this will just cause coil whine with no real benefit
callbackInfo.setReturnValue(Math.min(limit, Constants.NO_FRAME_RATE_LIMIT - 10));
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package dynamic_fps.impl.mixin;

import net.minecraft.client.gui.components.toasts.ToastManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import dynamic_fps.impl.DynamicFPSMod;
import net.minecraft.client.gui.components.toasts.ToastComponent;

@Mixin(ToastManager.class)
public class ToastManagerMixin {
@Inject(method = "freeSlotCount", at = @At("HEAD"), cancellable = true)
private void freeSlotCount(CallbackInfoReturnable<Integer> callbackInfo) {
@Mixin(ToastComponent.class)
public class ToastComponentMixin {
@Inject(method = "freeSlots", at = @At("HEAD"), cancellable = true)
private void hasFreeSlots(CallbackInfoReturnable<Integer> callbackInfo) {
if (!DynamicFPSMod.shouldShowToasts()) {
callbackInfo.setReturnValue(0);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package dynamic_fps.impl.mixin;

import dynamic_fps.impl.PowerState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

import com.mojang.blaze3d.platform.Window;

import dynamic_fps.impl.DynamicFPSMod;

@Mixin(Window.class)
public class WindowMixin {
/**
* Sets a frame rate limit while we're cancelling some or all rendering.
*/
@Inject(method = "getFramerateLimit", at = @At("RETURN"), cancellable = true)
private void onGetFramerateLimit(CallbackInfoReturnable<Integer> callbackInfo) {
PowerState state = DynamicFPSMod.powerState();

if (state != PowerState.FOCUSED) {
// Instruct Minecraft to render a minimum of 15 FPS
// Going lower here makes resuming again feel sluggish
callbackInfo.setReturnValue(Math.max(DynamicFPSMod.targetFrameRate(), 15));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import dynamic_fps.impl.feature.battery.BatteryTracker;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.network.chat.Component;

import static dynamic_fps.impl.util.Localization.localized;
Expand Down Expand Up @@ -58,7 +57,7 @@ private static void drawBatteryOverlay(GuiGraphics graphics) {
int[] position = config.placement().get(graphics);

// resource, x, y, z, ?, ?, width, height, width, height
graphics.blit(RenderType::guiTextured, icon, position[0], position[1], 0.0f, 0, 16, 16, 16, 16);
graphics.blit(icon, position[0], position[1], 0, 0.0f, 0.0f, 16, 16, 16, 16);
// font, text, x, y, text color
graphics.drawString(minecraft.font, BatteryTracker.charge() + "%", position[0] + 20, position[1] + 4, 0xFFFFFF);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"uncap_menu_frame_rate": false,
"idle": {
"timeout": 300,
"condition": "vanilla"
"condition": "on_battery"
},
"battery_tracker": {
"enabled": false,
Expand Down
Loading

0 comments on commit 1dc9357

Please sign in to comment.