Skip to content

Update to minecraft 26.3 #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bbb651 wants to merge 1 commit into from
Closed

Update to minecraft 26.3 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ org.gradle.configuration-cache=false

# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=26.2
minecraft_version=26.3
loader_version=0.19.0
loom_version=1.17-SNAPSHOT
fabric_api_version=0.152.2+26.2
fabric_api_version=0.160.7+26.3

# Mod Properties
mod_version=1.7.7
mod_version=1.7.8
maven_group=jerozgen
archives_base_name=language-reload

# Dependencies
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
# https://modrinth.com/mod/modmenu/versions
modmenu_version=20.0.0-beta.1
modmenu_version=21.0.0
9 changes: 4 additions & 5 deletions src/main/java/jerozgen/languagereload/LanguageReload.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import net.minecraft.locale.Language;
import net.minecraft.world.entity.Display;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.level.block.entity.SignTextSlot;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.lwjgl.glfw.GLFW;

import java.util.LinkedList;

Expand All @@ -40,8 +40,7 @@ public class LanguageReload implements ClientModInitializer {
public void onInitializeClient() {
reloadLanguagesKey = KeyMappingHelper.registerKeyMapping(new KeyMapping(
"key.debug.reloadLanguages",
InputConstants.Type.KEYSYM,
GLFW.GLFW_KEY_J,
InputConstants.KEY_J,
KeyMapping.Category.DEBUG
));
}
Expand Down Expand Up @@ -73,8 +72,8 @@ public static void reloadLanguages() {
if (chunk == null) continue;
for (var blockEntity : chunk.getBlockEntities().values()) {
if (!(blockEntity instanceof SignBlockEntity sign)) continue;
((SignTextAccessor) sign.getFrontText()).languagereload_setRenderMessages(null);
((SignTextAccessor) sign.getBackText()).languagereload_setRenderMessages(null);
((SignTextAccessor) sign.getText(SignTextSlot.FRONT)).languagereload_setRenderMessages(null);
((SignTextAccessor) sign.getText(SignTextSlot.BACK)).languagereload_setRenderMessages(null);
}
}

Expand Down
3 changes: 1 addition & 2 deletions src/main/java/jerozgen/languagereload/mixin/AdvancementTabMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public abstract class AdvancementTabMixin implements IAdvancementsTab {
@Override
public void languagereload_recreateWidgets() {
widgets.replaceAll((advancement, widget) -> {
var newWidget = new AdvancementWidget(
((AdvancementWidgetAccessor) widget).languagereload_getTab(),
var newWidget = AdvancementWidgetAccessor.languagereload_create(
minecraft,
((AdvancementWidgetAccessor) widget).languagereload_getAdvancementNode(),
((AdvancementWidgetAccessor) widget).languagereload_getDisplay()
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/jerozgen/languagereload/mixin/AdvancementWidgetAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
import net.minecraft.advancements.AdvancementNode;
import net.minecraft.advancements.AdvancementProgress;
import net.minecraft.advancements.DisplayInfo;
import net.minecraft.client.gui.screens.advancements.AdvancementTab;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.advancements.AdvancementWidget;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.gen.Invoker;

import java.util.List;

@Mixin(AdvancementWidget.class)
public interface AdvancementWidgetAccessor {
@Accessor("tab")
AdvancementTab languagereload_getTab();
@Invoker("<init>")
static AdvancementWidget languagereload_create(Minecraft minecraft, AdvancementNode advancementNode, DisplayInfo display) {
throw new AssertionError();
}

@Accessor("advancementNode")
AdvancementNode languagereload_getAdvancementNode();
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/jerozgen/languagereload/mixin/KeyboardHandlerMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ private void onKeyPress(long handle, int action, KeyEvent event, CallbackInfo ci
@Inject(method = "charTyped", at = @At("HEAD"), cancellable = true)
private void onCharTyped(long handle, CharacterEvent event, CallbackInfo ci) {
if (minecraft.options.keyDebugModifier.isDown()) {
var reloadLanguagesKeyCode = ((KeyMappingAccessor) LanguageReload.reloadLanguagesKey).languagereload_getKey().getValue();
if (InputConstants.isKeyDown(minecraft.getWindow(), reloadLanguagesKeyCode)) {
if (LanguageReload.reloadLanguagesKey.isDown()) {
ci.cancel();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"fabric-key-mapping-api-v1": "*",
"fabric-lifecycle-events-v1": "*",
"fabricloader": ">=0.19.0",
"minecraft": ">=26.2"
"minecraft": ">=26.3"
},
"suggests": {
"modmenu": "*"
Expand Down