diff --git a/build.gradle b/build.gradle index b024f20..95a3a04 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.9.2' + id 'fabric-loom' version '1.10.1' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index df66916..b7c68d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,15 +5,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.8 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 loader_version=0.16.14 loom_version=1.10-SNAPSHOT # Fabric API -fabric_version=0.119.3+1.21.4 +fabric_version=0.119.3+1.21.5 # Mod Properties -mod_version = 2.2.0 +mod_version = 2.2.2 maven_group = de.steamwar archives_base_name = AdvancedScripts \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4eaec46..18362b7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME 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 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java b/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java index 0647a72..8640d73 100644 --- a/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java +++ b/src/main/java/de/steamwar/advancedscripts/screen/ScriptEditScreen.java @@ -20,16 +20,15 @@ package de.steamwar.advancedscripts.screen; import com.mojang.blaze3d.systems.RenderSystem; -import de.steamwar.advancedscripts.lexer.TokenTypeColors; import de.steamwar.advancedscripts.lexer.ScriptColorizer; import de.steamwar.advancedscripts.lexer.Token; +import de.steamwar.advancedscripts.lexer.TokenTypeColors; import net.minecraft.client.font.TextHandler; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.ingame.BookEditScreen; import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder; import net.minecraft.client.gui.widget.PressableWidget; -import net.minecraft.client.render.GameRenderer; import net.minecraft.client.util.NarratorManager; import net.minecraft.client.util.SelectionManager; import net.minecraft.component.DataComponentTypes; @@ -43,9 +42,11 @@ import net.minecraft.text.Text; import net.minecraft.util.Hand; 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.stream.Collectors; public class ScriptEditScreen extends Screen { @@ -155,6 +156,10 @@ public class ScriptEditScreen extends Screen { } } + @Override + protected void applyBlur() { + } + @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { setFocused(null); @@ -629,7 +634,7 @@ public class ScriptEditScreen extends Screen { private void finalizeBook() { List pages = toPages(); 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())); }