Update to 1.21.5

This commit is contained in:
2025-07-30 13:51:44 +02:00
parent d7c9759d27
commit 4f98cc0267
4 changed files with 16 additions and 11 deletions

View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.9.2' id 'fabric-loom' version '1.10.1'
id 'maven-publish' id 'maven-publish'
} }

View File

@ -5,15 +5,15 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.21.4 minecraft_version=1.21.5
yarn_mappings=1.21.4+build.8 yarn_mappings=1.21.5+build.1
loader_version=0.16.14 loader_version=0.16.14
loom_version=1.10-SNAPSHOT loom_version=1.10-SNAPSHOT
# Fabric API # Fabric API
fabric_version=0.119.3+1.21.4 fabric_version=0.119.3+1.21.5
# Mod Properties # Mod Properties
mod_version = 2.2.0 mod_version = 2.2.2
maven_group = de.steamwar maven_group = de.steamwar
archives_base_name = AdvancedScripts archives_base_name = AdvancedScripts

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -20,16 +20,15 @@
package de.steamwar.advancedscripts.screen; package de.steamwar.advancedscripts.screen;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import de.steamwar.advancedscripts.lexer.TokenTypeColors;
import de.steamwar.advancedscripts.lexer.ScriptColorizer; import de.steamwar.advancedscripts.lexer.ScriptColorizer;
import de.steamwar.advancedscripts.lexer.Token; import de.steamwar.advancedscripts.lexer.Token;
import de.steamwar.advancedscripts.lexer.TokenTypeColors;
import net.minecraft.client.font.TextHandler; import net.minecraft.client.font.TextHandler;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.ingame.BookEditScreen; import net.minecraft.client.gui.screen.ingame.BookEditScreen;
import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
import net.minecraft.client.gui.widget.PressableWidget; import net.minecraft.client.gui.widget.PressableWidget;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.util.NarratorManager; import net.minecraft.client.util.NarratorManager;
import net.minecraft.client.util.SelectionManager; import net.minecraft.client.util.SelectionManager;
import net.minecraft.component.DataComponentTypes; import net.minecraft.component.DataComponentTypes;
@ -43,9 +42,11 @@ import net.minecraft.text.Text;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.mutable.MutableInt;
import java.util.*; import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
public class ScriptEditScreen extends Screen { public class ScriptEditScreen extends Screen {
@ -155,6 +156,10 @@ public class ScriptEditScreen extends Screen {
} }
} }
@Override
protected void applyBlur() {
}
@Override @Override
public void render(DrawContext context, int mouseX, int mouseY, float delta) { public void render(DrawContext context, int mouseX, int mouseY, float delta) {
setFocused(null); setFocused(null);
@ -629,7 +634,7 @@ public class ScriptEditScreen extends Screen {
private void finalizeBook() { private void finalizeBook() {
List<String> pages = toPages(); List<String> pages = toPages();
this.writeNbtData(pages); this.writeNbtData(pages);
int i = this.hand == Hand.MAIN_HAND ? this.player.getInventory().selectedSlot : 40; int i = this.hand == Hand.MAIN_HAND ? this.player.getInventory().getSelectedSlot() : 40;
this.client.getNetworkHandler().sendPacket(new BookUpdateC2SPacket(i, pages, Optional.empty())); this.client.getNetworkHandler().sendPacket(new BookUpdateC2SPacket(i, pages, Optional.empty()));
} }