Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,14 @@ public class FixesConfig {
@Config.DefaultBoolean(true)
public static boolean fixChatWrappedColors;

@Config.Comment("Fix newline characters in chat messages not rendering as line breaks")
@Config.DefaultBoolean(true)
public static boolean fixChatNewlines;

@Config.Comment("Fix newline characters in drawString not rendering as line breaks")
@Config.DefaultBoolean(true)
public static boolean fixFontRendererNewlines;

@Config.Comment("Prevents crash if server sends container with wrong itemStack size")
@Config.DefaultBoolean(true)
public static boolean fixContainerPutStacksInSlots;
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,14 @@ public enum Mixins implements IMixins {
.addClientMixins("minecraft.MixinGuiNewChat_FixColorWrapping")
.setApplyIf(() -> FixesConfig.fixChatWrappedColors)
.setPhase(Phase.EARLY)),
FIX_CHAT_NEWLINES(new MixinBuilder("Fix newline characters in chat messages not rendering as line breaks")
.addClientMixins("minecraft.MixinGuiNewChat_FixChatNewlines")
.setApplyIf(() -> FixesConfig.fixChatNewlines)
.setPhase(Phase.EARLY)),
FIX_FONT_RENDERER_NEWLINES(new MixinBuilder("Fix newline characters in drawString not rendering as line breaks")
.addClientMixins("minecraft.MixinFontRenderer_NewlineSupport")
.setApplyIf(() -> FixesConfig.fixFontRendererNewlines)
.setPhase(Phase.EARLY)),
COMPACT_CHAT(new MixinBuilder()
.addClientMixins("minecraft.MixinGuiNewChat_CompactChat")
.setApplyIf(() -> TweaksConfig.compactChat)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;

import java.util.List;

import net.minecraft.client.gui.FontRenderer;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

@Mixin(FontRenderer.class)
public abstract class MixinFontRenderer_NewlineSupport {

@Shadow
public int FONT_HEIGHT;

@Shadow
public abstract List<String> listFormattedStringToWidth(String str, int wrapWidth);

@Shadow
private int renderString(String text, int x, int y, int color, boolean shadow) {
return 0;
}

@Inject(method = "renderString", at = @At("HEAD"), cancellable = true)
private void hodgepodge$handleNewlines(String text, int x, int y, int color, boolean shadow,
CallbackInfoReturnable<Integer> cir) {
if (text == null || text.indexOf('\n') < 0) return;

List<String> lines = this.listFormattedStringToWidth(text, Integer.MAX_VALUE);
int lastX = 0;
for (int i = 0; i < lines.size(); i++) {
lastX = this.renderString(lines.get(i), x, y + i * this.FONT_HEIGHT, color, shadow);
}
cir.setReturnValue(lastX);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package com.mitchej123.hodgepodge.mixins.early.minecraft;

import java.util.ArrayList;
import java.util.List;

import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiNewChat;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.IChatComponent;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin(GuiNewChat.class)
public class MixinGuiNewChat_FixChatNewlines {

@Inject(method = "printChatMessageWithOptionalDeletion", at = @At("HEAD"), cancellable = true)
private void hodgepodge$splitNewlines(IChatComponent component, int id, CallbackInfo ci) {
String formatted = component.getFormattedText();
if (formatted.indexOf('\n') < 0) return;

List<IChatComponent> lines = hodgepodge$splitOnNewlines(formatted);
for (int i = 0; i < lines.size(); i++) {
((GuiNewChat) (Object) this).printChatMessageWithOptionalDeletion(lines.get(i), i == 0 ? id : 0);
Comment thread
alppp marked this conversation as resolved.
Outdated
}
ci.cancel();
}

@Unique
private static List<IChatComponent> hodgepodge$splitOnNewlines(String formatted) {
String[] parts = formatted.split("\n", -1);
List<IChatComponent> lines = new ArrayList<>();
String carryFormat = "";

for (String part : parts) {
String fullLine = carryFormat + part;
lines.add(new ChatComponentText(fullLine));
carryFormat = FontRenderer.getFormatFromString(fullLine);
}

return lines;
}
}
Loading