Skip to content

Commit bc9172b

Browse files
committed
A lot more bug fixes
1 parent 0f5ff26 commit bc9172b

File tree

6 files changed

+195
-374
lines changed

6 files changed

+195
-374
lines changed

src/main/java/llc/redstone/hysentials/command/HysentialsCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ public void helpPage(int page) {
395395

396396

397397
private static void handleTest(String command, String args) {
398-
if (Minecraft.getMinecraft().thePlayer.getName().equals("EndKloon") || Minecraft.getMinecraft().thePlayer.getName().equals("Sin_ender")) {
398+
if (Minecraft.getMinecraft().thePlayer.getName().equals("EndKloon") || Minecraft.getMinecraft().thePlayer.getName().equals("Pumpkin_ender")) {
399399
switch (command.toLowerCase()) {
400400
case "switch": {
401401
boolean isCurrentlyLocal = HysentialsUtilsKt.getHYSENTIALS_API().equals("http://localhost:8080/api");

src/main/java/llc/redstone/hysentials/mixin/GuiUtilRCMixin.java

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,11 @@
1919

2020
@Mixin(value = GuiUtilRenderComponents.class)
2121
public class GuiUtilRCMixin {
22-
// @Redirect(method = "splitText", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/FontRenderer;getFormatFromString(Ljava/lang/String;)Ljava/lang/String;"))
23-
// private static String getFormatString(String c0) {
24-
// if (!FormattingConfig.fancyRendering()) {
25-
// return FontRenderer.getFormatFromString(c0);
26-
// }
27-
// return FancyFormatting2.Companion.getLastFormat(c0);
28-
// }
29-
//
30-
// @Redirect(method = "splitText", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/FontRenderer;getStringWidth(Ljava/lang/String;)I"))
31-
// private static int onGetStringWidth(FontRenderer fr, String c0) {
32-
// if (!FormattingConfig.fancyRendering()) {
33-
// return fr.getStringWidth(c0);
34-
// }
35-
// c0 = FancyFormatting2.Companion.replaceString(c0, true);
36-
// return fr.getStringWidth(c0);
37-
// }
38-
//
39-
// @Redirect(method = "splitText", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/FontRenderer;trimStringToWidth(Ljava/lang/String;IZ)Ljava/lang/String;"))
40-
// private static String onTrimStringToWidth(FontRenderer fr, String c0, int c1, boolean c2) {
41-
// if (!FormattingConfig.fancyRendering()) {
42-
// return fr.trimStringToWidth(c0, c1, c2);
43-
// }
44-
// c0 = FancyFormatting2.Companion.replaceString(c0, true);
45-
// return fr.trimStringToWidth(c0, c1, c2);
46-
//// return fr.trimStringToWidth(c0, c1, c2);
47-
// }
48-
4922
@Inject(method="splitText", at=@At("HEAD"), cancellable = true)
5023
private static void onSplitText(IChatComponent p_178908_0_, int p_178908_1_, FontRenderer p_178908_2_, boolean p_178908_3_, boolean p_178908_4_, CallbackInfoReturnable<List<IChatComponent>> cir) {
51-
if (FormattingConfig.fancyRendering()) {
52-
cir.setReturnValue(ImageIconRenderer.splitText(p_178908_0_, p_178908_1_, p_178908_2_, p_178908_3_, p_178908_4_));
24+
if (FormattingConfig.fancyRendering() && !p_178908_3_ && !p_178908_4_) { //Look for chat messages only
25+
//signs and books can eat shit :)
26+
cir.setReturnValue(ImageIconRenderer.splitTextOld(p_178908_0_, p_178908_1_, p_178908_2_, false, false));
5327
}
5428
}
5529
}

0 commit comments

Comments
 (0)