3 Commits
2.2.1 ... 1.21

Author SHA1 Message Date
5953eb0640 Downgrade to 1.21 2025-07-30 15:34:43 +02:00
4f98cc0267 Update to 1.21.5 2025-07-30 13:51:44 +02:00
d7c9759d27 Update to 1.21.3 2025-06-14 20:29:35 +02:00
7 changed files with 29 additions and 15 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'
} }
@ -15,6 +15,7 @@ dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}" minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
} }
loom { loom {

View File

@ -4,11 +4,16 @@ 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
yarn_mappings=1.21.4+build.8 minecraft_version=1.21
loader_version=0.16.10 yarn_mappings=1.21+build.1
loader_version=0.16.14
loom_version=1.10-SNAPSHOT
# Fabric API
fabric_version=0.100.3+1.21
# 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,10 +20,12 @@
package de.steamwar.advancedscripts; package de.steamwar.advancedscripts;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
public class AdvancedScripts implements ClientModInitializer { public class AdvancedScripts implements ClientModInitializer {
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
PayloadTypeRegistry.playC2S().register(KeyAction.ID, KeyAction.CODEC);
} }
} }

View File

@ -20,9 +20,9 @@
package de.steamwar.advancedscripts.mixin; package de.steamwar.advancedscripts.mixin;
import de.steamwar.advancedscripts.KeyAction; import de.steamwar.advancedscripts.KeyAction;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.client.Keyboard; import net.minecraft.client.Keyboard;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@ -34,7 +34,7 @@ public class KeyboardMixin {
public void sendKeyPress(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) { public void sendKeyPress(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
MinecraftClient client = ((Keyboard) (Object)this).client; MinecraftClient client = ((Keyboard) (Object)this).client;
if(client.currentScreen == null && action != 2) { if(client.currentScreen == null && action != 2) {
client.getNetworkHandler().sendPacket(new CustomPayloadC2SPacket(new KeyAction(key, (byte) action, modifiers))); ClientPlayNetworking.send(new KeyAction(key, (byte) action, modifiers));
} }
} }
} }

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 {
@ -72,7 +73,7 @@ public class ScriptEditScreen extends Screen {
this.itemStack = itemStack; this.itemStack = itemStack;
this.hand = hand; this.hand = hand;
List<RawFilteredPair<String>> pages = itemStack.get(DataComponentTypes.WRITABLE_BOOK_CONTENT).pages(); List<RawFilteredPair<String>> pages = itemStack.getComponents().get(DataComponentTypes.WRITABLE_BOOK_CONTENT).pages();
pages.forEach(stringRawFilteredPair -> { pages.forEach(stringRawFilteredPair -> {
for (String s : stringRawFilteredPair.raw().split("\n")) { for (String s : stringRawFilteredPair.raw().split("\n")) {
if (s.isEmpty()) { if (s.isEmpty()) {
@ -102,7 +103,7 @@ public class ScriptEditScreen extends Screen {
this.addDrawableChild( this.addDrawableChild(
new Button(BOOK, this.width - 98 - 5, height - 20 - 5, () -> { new Button(BOOK, this.width - 98 - 5, height - 20 - 5, () -> {
finalizeBook(); finalizeBook();
this.client.setScreen(new BookEditScreen(player, itemStack, hand, toContent(toPages()))); this.client.setScreen(new BookEditScreen(player, itemStack, hand));
}) })
); );
} }
@ -155,6 +156,10 @@ public class ScriptEditScreen extends Screen {
} }
} }
@Override
protected void applyBlur(float delta) {
}
@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);

View File

@ -23,7 +23,8 @@
"depends": { "depends": {
"fabricloader": ">=0.14.11", "fabricloader": ">=0.14.11",
"minecraft": ">=1.20.6", "minecraft": ">=1.20.6",
"java": ">=21" "java": ">=21",
"fabric-api": "*"
}, },
"accessWidener" : "advancedscripts.accesswidener" "accessWidener" : "advancedscripts.accesswidener"
} }