Motschen/MidnightControls
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightControls.git synced 2025-12-13 07:15:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: edit signs using the virtual keyboard!

Browse Source
This commit is contained in:
Martin Prokoph
2025-05-19 22:49:26 +02:00
parent 7375e5ad20
commit 0f407ac245
5 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenAccessor.java
View File

@@ -1,15 +0,0 @@
package eu.midnightdust.midnightcontrols.client.mixin;
import net.minecraft.block.entity.SignText;
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(AbstractSignEditScreen.class)
public interface AbstractSignEditScreenAccessor {
@Accessor("text")
SignText midnightcontrols$getText();
@Accessor("text")
void midnightcontrols$setText(SignText text);
}

34
common/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/AbstractSignEditScreenMixin.java Normal file
View File

@@ -0,0 +1,34 @@
package eu.midnightdust.midnightcontrols.client.mixin;
import eu.midnightdust.midnightcontrols.client.util.AbstractSignEditScreenAccessor;
import net.minecraft.block.entity.SignBlockEntity;
import net.minecraft.block.entity.SignText;
import net.minecraft.client.gui.screen.ingame.AbstractSignEditScreen;
import net.minecraft.text.Text;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@Mixin(AbstractSignEditScreen.class)
public class AbstractSignEditScreenMixin implements AbstractSignEditScreenAccessor {
@Shadow @Final private String[] messages;
@Shadow private SignText text;
@Shadow @Final protected SignBlockEntity blockEntity;
@Shadow @Final private boolean front;
@Override
public String[] midnightcontrols$getMessages() {
return messages;
}
@Override
public void midnightcontrols$setMessage(int line, String text) {
this.messages[line] = text;
this.text = this.text.withMessage(line, Text.literal(text));
}
@Override
public void midnightcontrols$writeToBlockEntity() {
this.blockEntity.setText(this.text, this.front);
}
}

14
common/src/main/java/eu/midnightdust/midnightcontrols/client/util/AbstractSignEditScreenAccessor.java Normal file
View File

@@ -0,0 +1,14 @@
package eu.midnightdust.midnightcontrols.client.util;
import org.spongepowered.asm.mixin.Unique;
public interface AbstractSignEditScreenAccessor {
@Unique
String[] midnightcontrols$getMessages();
@Unique
void midnightcontrols$setMessage(int line, String text);
@Unique
void midnightcontrols$writeToBlockEntity();
}

22
common/src/main/java/eu/midnightdust/midnightcontrols/client/virtualkeyboard/clickhandler/SignEditScreenClickHandler.java
View File

@@ -1,8 +1,11 @@
package eu.midnightdust.midnightcontrols.client.virtualkeyboard.clickhandler;
import eu.midnightdust.midnightcontrols.client.mixin.AbstractSignEditScreenAccessor;
import eu.midnightdust.midnightcontrols.client.util.AbstractSignEditScreenAccessor;
import eu.midnightdust.midnightcontrols.client.virtualkeyboard.gui.VirtualKeyboardScreen;
import net.minecraft.client.gui.screen.ingame.SignEditScreen;
import static eu.midnightdust.midnightcontrols.client.MidnightControlsClient.client;
public class SignEditScreenClickHandler extends AbstractScreenClickHandler<SignEditScreen> {
@Override
public void handle(SignEditScreen screen, double mouseX, double mouseY) {
@@ -12,5 +15,22 @@ public class SignEditScreenClickHandler extends AbstractScreenClickHandler<SignE
}
var accessor = (AbstractSignEditScreenAccessor) screen;
StringBuilder linesToString = new StringBuilder();
String[] messages = accessor.midnightcontrols$getMessages();
for (int i = 0; i < Math.min(4, messages.length); i++) {
String line = messages[i];
linesToString.append(line);
if (!line.isEmpty() && i < 3) linesToString.append("\n");
}
VirtualKeyboardScreen virtualKeyboardScreen = new VirtualKeyboardScreen(linesToString.toString(), (text) -> {
client.setScreen(screen);
String[] lines = text.split("\n");
for (int i = 0; i < 4; i++) accessor.midnightcontrols$setMessage(i, lines.length > i ? lines[i] : "");
accessor.midnightcontrols$writeToBlockEntity();
}, true);
client.setScreen(virtualKeyboardScreen);
}
}

6
common/src/main/resources/midnightcontrols.mixins.json
View File

@@ -3,6 +3,8 @@
"package": "eu.midnightdust.midnightcontrols.client.mixin",
"compatibilityLevel": "JAVA_21",
"client": [
"AbstractBlockAccessor",
"AbstractSignEditScreenMixin",
"AdvancementsScreenAccessor",
"BookEditScreenAccessor",
"ChatScreenMixin",
@@ -24,10 +26,8 @@
"RecipeBookScreenAccessor",
"RecipeBookWidgetAccessor",
"ScreenMixin",
"AbstractSignEditScreenAccessor",
"TabNavigationWidgetAccessor",
"WorldRendererMixin",
"AbstractBlockAccessor"
"WorldRendererMixin"
],
"injectors": {
"defaultRequire": 1