R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.2 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-10-25 15:00:19 -04:00
commit daea9dd83a
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
View File

@ -20,6 +20,7 @@ import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import java.io.*; import java.io.*;
import java.net.URL;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.*; import java.util.*;
import java.util.function.BooleanSupplier; import java.util.function.BooleanSupplier;
@ -156,7 +157,6 @@ public class ModernFixEarlyConfig {
private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = new DefaultSettingMapBuilder() private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = new DefaultSettingMapBuilder()
.put("mixin.perf.dynamic_resources", false) .put("mixin.perf.dynamic_resources", false)
.putConditionally(() -> !isFabric, "mixin.perf.async_jei", false)
.put("mixin.perf.dynamic_sounds", false) .put("mixin.perf.dynamic_sounds", false)
.put("mixin.perf.dynamic_block_codecs", false) .put("mixin.perf.dynamic_block_codecs", false)
.put("mixin.feature.direct_stack_trace", false) .put("mixin.feature.direct_stack_trace", false)
@ -237,7 +237,10 @@ public class ModernFixEarlyConfig {
if(!ModernFixPlatformHooks.INSTANCE.isDevEnv()) if(!ModernFixPlatformHooks.INSTANCE.isDevEnv())
return; return;
try { try {
if(ModernFixEarlyConfig.class.getClassLoader().getResource("/net/minecraft/world/level/Level.class") == null) { URL deobfClass = isFabric ?
ModernFixEarlyConfig.class.getResource("/net/minecraft/world/level/Level.class") :
ModernFixEarlyConfig.class.getClassLoader().getResource("/net/minecraft/world/level/Level.class");
if(deobfClass == null) {
LOGGER.warn("We are in a non-Mojmap dev environment. Disabling blockstate cache patch"); LOGGER.warn("We are in a non-Mojmap dev environment. Disabling blockstate cache patch");
this.options.get("mixin.perf.reduce_blockstate_cache_rebuilds").addModOverride(false, "[not mojmap]"); this.options.get("mixin.perf.reduce_blockstate_cache_rebuilds").addModOverride(false, "[not mojmap]");
} }

7
common/src/main/java/org/embeddedt/modernfix/screen/ModernFixConfigScreen.java
View File

@ -13,6 +13,8 @@ public class ModernFixConfigScreen extends Screen {
public boolean madeChanges = false; public boolean madeChanges = false;
private Button doneButton, wikiButton; private Button doneButton, wikiButton;
private double lastScrollAmount = 0;
public ModernFixConfigScreen(Screen lastScreen) { public ModernFixConfigScreen(Screen lastScreen) {
super(Component.translatable("modernfix.config")); super(Component.translatable("modernfix.config"));
this.lastScreen = lastScreen; this.lastScreen = lastScreen;
@ -21,6 +23,7 @@ public class ModernFixConfigScreen extends Screen {
@Override @Override
protected void init() { protected void init() {
this.optionList = new OptionList(this, this.minecraft); this.optionList = new OptionList(this, this.minecraft);
this.optionList.setScrollAmount(lastScrollAmount);
this.addWidget(this.optionList); this.addWidget(this.optionList);
this.wikiButton = new Button.Builder(Component.translatable("modernfix.config.wiki"), (arg) -> { this.wikiButton = new Button.Builder(Component.translatable("modernfix.config.wiki"), (arg) -> {
Util.getPlatform().openUri("https://github.com/embeddedt/ModernFix/wiki/Summary-of-Patches"); Util.getPlatform().openUri("https://github.com/embeddedt/ModernFix/wiki/Summary-of-Patches");
@ -45,4 +48,8 @@ public class ModernFixConfigScreen extends Screen {
this.doneButton.setMessage(madeChanges ? Component.translatable("modernfix.config.done_restart") : CommonComponents.GUI_DONE); this.doneButton.setMessage(madeChanges ? Component.translatable("modernfix.config.done_restart") : CommonComponents.GUI_DONE);
super.render(guiGraphics, mouseX, mouseY, partialTicks); super.render(guiGraphics, mouseX, mouseY, partialTicks);
} }
public void setLastScrollAmount(double d) {
this.lastScrollAmount = d;
}
} }

1
common/src/main/java/org/embeddedt/modernfix/screen/OptionList.java
View File

@ -166,6 +166,7 @@ public class OptionList extends ContainerObjectSelectionList<OptionList.Entry> {
}).tooltip(toggleTooltip).pos(0, 0).size(55, 20).build(); }).tooltip(toggleTooltip).pos(0, 0).size(55, 20).build();
updateStatus(); updateStatus();
this.helpButton = new Button.Builder(Component.literal("?"), (arg) -> { this.helpButton = new Button.Builder(Component.literal("?"), (arg) -> {
mainScreen.setLastScrollAmount(getScrollAmount());
Minecraft.getInstance().setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName)); Minecraft.getInstance().setScreen(new ModernFixOptionInfoScreen(mainScreen, optionName));
}).pos(75, 0).size(20, 20).build(); }).pos(75, 0).size(20, 20).build();
if(!I18n.exists("modernfix.option." + optionName)) { if(!I18n.exists("modernfix.option." + optionName)) {