aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorWyvest <45589059+Wyvest@users.noreply.github.com>2022-01-01 22:11:34 +0700
committerWyvest <45589059+Wyvest@users.noreply.github.com>2022-01-01 22:11:34 +0700
commitcc4a11c7943d9036dc71679eaa531832cd2a2f0c (patch)
treeda242580d43fa6f26f0b0b04deab82c200a5bb16 /src/main/java
parent856df4d08d3c392b35f256966f6263da86fdb7ab (diff)
downloadChatting-cc4a11c7943d9036dc71679eaa531832cd2a2f0c.tar.gz
Chatting-cc4a11c7943d9036dc71679eaa531832cd2a2f0c.tar.bz2
Chatting-cc4a11c7943d9036dc71679eaa531832cd2a2f0c.zip
Chattils 1.0.0
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/cc/woverflow/chattils/hook/GuiNewChatHook.java (renamed from src/main/java/com/raeids/stratus/hook/GuiNewChatHook.java)4
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/ClientCommandHandlerMixin.java (renamed from src/main/java/com/raeids/stratus/mixin/ClientCommandHandlerMixin.java)9
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/EntityPlayerSPMixin.java (renamed from src/main/java/com/raeids/stratus/mixin/EntityPlayerSPMixin.java)8
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/GuiChatMixin.java (renamed from src/main/java/com/raeids/stratus/mixin/GuiChatMixin.java)29
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/GuiNewChatAccessor.java (renamed from src/main/java/com/raeids/stratus/mixin/GuiNewChatAccessor.java)2
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/GuiNewChatMapMixin.java (renamed from src/main/java/com/raeids/stratus/mixin/GuiNewChatMapMixin.java)8
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/GuiNewChatMixin.java (renamed from src/main/java/com/raeids/stratus/mixin/GuiNewChatMixin.java)74
-rw-r--r--src/main/java/cc/woverflow/chattils/mixin/WyvtilsListenerMixin.java (renamed from src/main/java/com/raeids/stratus/mixin/WyvtilsListenerMixin.java)6
8 files changed, 72 insertions, 68 deletions
diff --git a/src/main/java/com/raeids/stratus/hook/GuiNewChatHook.java b/src/main/java/cc/woverflow/chattils/hook/GuiNewChatHook.java
index 67552c4..f84fd43 100644
--- a/src/main/java/com/raeids/stratus/hook/GuiNewChatHook.java
+++ b/src/main/java/cc/woverflow/chattils/hook/GuiNewChatHook.java
@@ -1,4 +1,4 @@
-package com.raeids.stratus.hook;
+package cc.woverflow.chattils.hook;
import net.minecraft.client.gui.ChatLine;
@@ -9,7 +9,7 @@ public interface GuiNewChatHook {
boolean shouldCopy();
- Transferable getStratusChatComponent(int mouseY);
+ Transferable getChattilsChatComponent(int mouseY);
default ChatLine getFullMessage(ChatLine line) {
throw new AssertionError("getFullMessage not overridden on GuiNewChat");
diff --git a/src/main/java/com/raeids/stratus/mixin/ClientCommandHandlerMixin.java b/src/main/java/cc/woverflow/chattils/mixin/ClientCommandHandlerMixin.java
index ecdef69..0692342 100644
--- a/src/main/java/com/raeids/stratus/mixin/ClientCommandHandlerMixin.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/ClientCommandHandlerMixin.java
@@ -1,7 +1,7 @@
-package com.raeids.stratus.mixin;
+package cc.woverflow.chattils.mixin;
-import com.raeids.stratus.config.StratusConfig;
-import com.raeids.stratus.chat.ChatShortcuts;
+import cc.woverflow.chattils.chat.ChatShortcuts;
+import cc.woverflow.chattils.config.ChattilsConfig;
import kotlin.Pair;
import net.minecraft.client.Minecraft;
import net.minecraft.command.CommandHandler;
@@ -13,6 +13,7 @@ import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
+import java.util.Iterator;
import java.util.List;
@Mixin(value = ClientCommandHandler.class, remap = false)
@@ -21,7 +22,7 @@ public class ClientCommandHandlerMixin extends CommandHandler {
private List<String> addChatShortcuts(ClientCommandHandler instance, ICommandSender iCommandSender, String leftOfCursor, BlockPos blockPos) {
Minecraft mc = FMLClientHandler.instance().getClient();
List<String> autocompleteList = instance.getTabCompletionOptions(mc.thePlayer, leftOfCursor, mc.thePlayer.getPosition());
- if (StratusConfig.INSTANCE.getChatShortcuts()) {
+ if (ChattilsConfig.INSTANCE.getChatShortcuts()) {
for (Pair<String, String> pair : ChatShortcuts.INSTANCE.getShortcuts()) {
if (pair.getFirst().startsWith(leftOfCursor)) {
autocompleteList.add(pair.getFirst());
diff --git a/src/main/java/com/raeids/stratus/mixin/EntityPlayerSPMixin.java b/src/main/java/cc/woverflow/chattils/mixin/EntityPlayerSPMixin.java
index c605511..48dfc10 100644
--- a/src/main/java/com/raeids/stratus/mixin/EntityPlayerSPMixin.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/EntityPlayerSPMixin.java
@@ -1,7 +1,7 @@
-package com.raeids.stratus.mixin;
+package cc.woverflow.chattils.mixin;
-import com.raeids.stratus.config.StratusConfig;
-import com.raeids.stratus.chat.ChatTabs;
+import cc.woverflow.chattils.chat.ChatTabs;
+import cc.woverflow.chattils.config.ChattilsConfig;
import net.minecraft.client.entity.EntityPlayerSP;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -12,7 +12,7 @@ public class EntityPlayerSPMixin {
@ModifyVariable(method = "sendChatMessage", at = @At("HEAD"), ordinal = 0, argsOnly = true)
private String handleSentMessages(String value) {
if (value.startsWith("/")) return value;
- if (StratusConfig.INSTANCE.getChatTabs() && ChatTabs.INSTANCE.getCurrentTab() != null && !ChatTabs.INSTANCE.getCurrentTab().getPrefix().isEmpty()) {
+ if (ChattilsConfig.INSTANCE.getChatTabs() && ChatTabs.INSTANCE.getCurrentTab() != null && !ChatTabs.INSTANCE.getCurrentTab().getPrefix().isEmpty()) {
return ChatTabs.INSTANCE.getCurrentTab().getPrefix() + value;
} else {
return value;
diff --git a/src/main/java/com/raeids/stratus/mixin/GuiChatMixin.java b/src/main/java/cc/woverflow/chattils/mixin/GuiChatMixin.java
index bf0ac79..9af0204 100644
--- a/src/main/java/com/raeids/stratus/mixin/GuiChatMixin.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/GuiChatMixin.java
@@ -1,12 +1,15 @@
-package com.raeids.stratus.mixin;
+package cc.woverflow.chattils.mixin;
+import cc.woverflow.chattils.chat.ChatSearchingManager;
+import cc.woverflow.chattils.chat.ChatShortcuts;
+import cc.woverflow.chattils.chat.ChatTab;
+import cc.woverflow.chattils.chat.ChatTabs;
+import cc.woverflow.chattils.config.ChattilsConfig;
+import cc.woverflow.chattils.gui.components.ScreenshotButton;
+import cc.woverflow.chattils.gui.components.SearchButton;
+import cc.woverflow.chattils.hook.GuiNewChatHook;
+import cc.woverflow.chattils.utils.ModCompatHooks;
import com.google.common.collect.Lists;
-import com.raeids.stratus.chat.*;
-import com.raeids.stratus.config.StratusConfig;
-import com.raeids.stratus.gui.components.ScreenshotButton;
-import com.raeids.stratus.gui.components.SearchButton;
-import com.raeids.stratus.hook.*;
-import com.raeids.stratus.utils.ModCompatHooks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiChat;
import net.minecraft.client.gui.GuiScreen;
@@ -43,12 +46,12 @@ public abstract class GuiChatMixin extends GuiScreen {
@Inject(method = "initGui", at = @At("TAIL"))
private void init(CallbackInfo ci) {
- if (StratusConfig.INSTANCE.getChatSearch()) {
+ if (ChattilsConfig.INSTANCE.getChatSearch()) {
searchButton = new SearchButton();
buttonList.add(searchButton);
}
buttonList.add(new ScreenshotButton());
- if (StratusConfig.INSTANCE.getChatTabs()) {
+ if (ChattilsConfig.INSTANCE.getChatTabs()) {
for (ChatTab chatTab : ChatTabs.INSTANCE.getTabs()) {
buttonList.add(chatTab.getButton());
}
@@ -57,14 +60,14 @@ public abstract class GuiChatMixin extends GuiScreen {
@Inject(method = "updateScreen", at = @At("HEAD"))
private void updateScreen(CallbackInfo ci) {
- if (StratusConfig.INSTANCE.getChatSearch() && searchButton.isEnabled()) {
+ if (ChattilsConfig.INSTANCE.getChatSearch() && searchButton.isEnabled()) {
searchButton.getInputField().updateCursorCounter();
}
}
@Inject(method = "keyTyped", at = @At("HEAD"), cancellable = true)
private void keyTyped(char typedChar, int keyCode, CallbackInfo ci) {
- if (StratusConfig.INSTANCE.getChatSearch() && searchButton.isEnabled()) {
+ if (ChattilsConfig.INSTANCE.getChatSearch() && searchButton.isEnabled()) {
ci.cancel();
if (keyCode == 1) {
searchButton.onMousePress();
@@ -92,7 +95,7 @@ public abstract class GuiChatMixin extends GuiScreen {
float f = mc.ingameGUI.getChatGUI().getChatScale();
int x = MathHelper.floor_float((float) mouseX / f);
if (hook.shouldCopy() && (hook.getRight() + ModCompatHooks.getXOffset()) <= x && (hook.getRight() + ModCompatHooks.getXOffset()) + 9 > x) {
- Transferable message = hook.getStratusChatComponent(Mouse.getY());
+ Transferable message = hook.getChattilsChatComponent(Mouse.getY());
if (message == null) return;
try {
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(message, null);
@@ -104,7 +107,7 @@ public abstract class GuiChatMixin extends GuiScreen {
@ModifyArg(method = "keyTyped", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiChat;sendChatMessage(Ljava/lang/String;)V"), index = 0)
private String modifySentMessage(String original) {
- if (StratusConfig.INSTANCE.getChatShortcuts()) {
+ if (ChattilsConfig.INSTANCE.getChatShortcuts()) {
if (original.startsWith("/")) {
return "/" + ChatShortcuts.INSTANCE.handleSentCommand(StringUtils.substringAfter(original, "/"));
}
diff --git a/src/main/java/com/raeids/stratus/mixin/GuiNewChatAccessor.java b/src/main/java/cc/woverflow/chattils/mixin/GuiNewChatAccessor.java
index 43d4288..1bce77a 100644
--- a/src/main/java/com/raeids/stratus/mixin/GuiNewChatAccessor.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/GuiNewChatAccessor.java
@@ -1,4 +1,4 @@
-package com.raeids.stratus.mixin;
+package cc.woverflow.chattils.mixin;
import net.minecraft.client.gui.ChatLine;
import net.minecraft.client.gui.GuiNewChat;
diff --git a/src/main/java/com/raeids/stratus/mixin/GuiNewChatMapMixin.java b/src/main/java/cc/woverflow/chattils/mixin/GuiNewChatMapMixin.java
index 8f581f9..97d39c5 100644
--- a/src/main/java/com/raeids/stratus/mixin/GuiNewChatMapMixin.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/GuiNewChatMapMixin.java
@@ -1,6 +1,6 @@
-package com.raeids.stratus.mixin;
+package cc.woverflow.chattils.mixin;
-import com.raeids.stratus.hook.GuiNewChatHook;
+import cc.woverflow.chattils.hook.GuiNewChatHook;
import net.minecraft.client.gui.ChatLine;
import net.minecraft.client.gui.GuiNewChat;
import net.minecraft.util.IChatComponent;
@@ -33,7 +33,7 @@ public abstract class GuiNewChatMapMixin implements GuiNewChatHook {
tempDrawnLines.clear();
}
- @Inject(method = "setChatLine", at = @At(value = "INVOKE", target = "Ljava/util/List;add(ILjava/lang/Object;)V", ordinal = 0, shift = At.Shift.AFTER))
+ @Inject(method = "setChatLine", at = @At(value = "INVOKE", target = "Ljava/util/List;add(ILjava/lang/Object;)V", ordinal = 0, shift = At.Shift.AFTER, remap = false))
private void handleDrawnLineAdded(IChatComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci) {
if (!displayOnly) tempDrawnLines.add(drawnChatLines.get(0));
else if (lastTempLine != null) {
@@ -41,7 +41,7 @@ public abstract class GuiNewChatMapMixin implements GuiNewChatHook {
}
}
- @Inject(method = "setChatLine", at = @At(value = "INVOKE", target = "Ljava/util/List;remove(I)Ljava/lang/Object;", ordinal = 0, shift = At.Shift.BEFORE))
+ @Inject(method = "setChatLine", at = @At(value = "INVOKE", target = "Ljava/util/List;remove(I)Ljava/lang/Object;", ordinal = 0, shift = At.Shift.BEFORE, remap = false))
private void handleDrawnLineRemoved(IChatComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci) {
drawnToFull.remove(drawnChatLines.get(drawnChatLines.size() - 1));
}
diff --git a/src/main/java/com/raeids/stratus/mixin/GuiNewChatMixin.java b/src/main/java/cc/woverflow/chattils/mixin/GuiNewChatMixin.java
index f606d4e..eea68c8 100644
--- a/src/main/java/com/raeids/stratus/mixin/GuiNewChatMixin.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/GuiNewChatMixin.java
@@ -1,12 +1,12 @@
-package com.raeids.stratus.mixin;
-
-import com.raeids.stratus.Stratus;
-import com.raeids.stratus.chat.ChatSearchingManager;
-import com.raeids.stratus.chat.ChatTabs;
-import com.raeids.stratus.config.StratusConfig;
-import com.raeids.stratus.hook.GuiNewChatHook;
-import com.raeids.stratus.utils.ModCompatHooks;
-import com.raeids.stratus.utils.RenderHelper;
+package cc.woverflow.chattils.mixin;
+
+import cc.woverflow.chattils.Chattils;
+import cc.woverflow.chattils.chat.ChatSearchingManager;
+import cc.woverflow.chattils.chat.ChatTabs;
+import cc.woverflow.chattils.config.ChattilsConfig;
+import cc.woverflow.chattils.hook.GuiNewChatHook;
+import cc.woverflow.chattils.utils.ModCompatHooks;
+import cc.woverflow.chattils.utils.RenderHelper;
import gg.essential.universal.UMouse;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.*;
@@ -33,15 +33,15 @@ import java.util.Locale;
@Mixin(value = GuiNewChat.class, priority = Integer.MIN_VALUE)
public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
- @Unique private int stratus$right = 0;
- @Unique private boolean stratus$shouldCopy;
- @Unique private boolean stratus$chatCheck;
- @Unique private int stratus$textOpacity;
+ @Unique private int chattils$right = 0;
+ @Unique private boolean chattils$shouldCopy;
+ @Unique private boolean chattils$chatCheck;
+ @Unique private int chattils$textOpacity;
@Shadow @Final private Minecraft mc;
@Shadow @Final private List<ChatLine> drawnChatLines;
@SuppressWarnings({"FieldCanBeLocal", "unused"})
private float percentComplete;
- private String stratus$previousText = "";
+ private String chattils$previousText = "";
@Shadow public abstract boolean getChatOpen();
@@ -54,12 +54,12 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
@Shadow public abstract void deleteChatLine(int id);
- @Unique private static final ResourceLocation COPY = new ResourceLocation("stratus:copy.png");
+ @Unique private static final ResourceLocation COPY = new ResourceLocation("chattils:copy.png");
@Inject(method = "printChatMessageWithOptionalDeletion", at = @At("HEAD"), cancellable = true)
private void handlePrintChatMessage(IChatComponent chatComponent, int chatLineId, CallbackInfo ci) {
handleChatTabMessage(chatComponent, chatLineId, mc.ingameGUI.getUpdateCounter(), false, ci);
- if (!EnumChatFormatting.getTextWithoutFormattingCodes(chatComponent.getUnformattedText()).toLowerCase(Locale.ENGLISH).contains(stratus$previousText.toLowerCase(Locale.ENGLISH))) {
+ if (!EnumChatFormatting.getTextWithoutFormattingCodes(chatComponent.getUnformattedText()).toLowerCase(Locale.ENGLISH).contains(chattils$previousText.toLowerCase(Locale.ENGLISH))) {
percentComplete = 1.0F;
}
}
@@ -72,20 +72,20 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
@Inject(method = "drawChat", at = @At("HEAD"))
private void checkScreenshotKeybind(int j2, CallbackInfo ci) {
- if (Stratus.INSTANCE.getKeybind().isPressed()) {
- Stratus.INSTANCE.setDoTheThing(true);
+ if (Chattils.INSTANCE.getKeybind().isPressed()) {
+ Chattils.INSTANCE.setDoTheThing(true);
}
- stratus$chatCheck = false;
+ chattils$chatCheck = false;
}
@ModifyVariable(method = "drawChat", at = @At("HEAD"), argsOnly = true)
private int setUpdateCounterWhjenYes(int updateCounter) {
- return Stratus.INSTANCE.getDoTheThing() ? 0 : updateCounter;
+ return Chattils.INSTANCE.getDoTheThing() ? 0 : updateCounter;
}
@ModifyVariable(method = "drawChat", at = @At("STORE"), index = 2)
private int setChatLimitWhenYes(int linesToDraw) {
- return Stratus.INSTANCE.getDoTheThing()
+ return Chattils.INSTANCE.getDoTheThing()
? GuiNewChat.calculateChatboxHeight(mc.gameSettings.chatHeightFocused) / 9
: linesToDraw;
}
@@ -103,7 +103,7 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
mouseX = MathHelper.floor_float((float)mouseX / f);
mouseY = -(MathHelper.floor_float((float)mouseY / f)); //WHY DO I NEED TO DO THIS
if (mouseX >= (left + ModCompatHooks.getXOffset()) && mouseY < bottom && mouseX < (right + 9 + ModCompatHooks.getXOffset()) && mouseY >= top) {
- stratus$shouldCopy = true;
+ chattils$shouldCopy = true;
drawCopyChatBox(right, top);
}
}
@@ -111,12 +111,12 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
@Redirect(method = "drawChat", at = @At(value = "FIELD", target = "Lnet/minecraft/client/gui/GuiNewChat;drawnChatLines:Ljava/util/List;", opcode = Opcodes.GETFIELD))
private List<ChatLine> injected(GuiNewChat instance) {
- return ChatSearchingManager.filterMessages(stratus$previousText, drawnChatLines);
+ return ChatSearchingManager.filterMessages(chattils$previousText, drawnChatLines);
}
@ModifyVariable(method = "drawChat", at = @At("STORE"), ordinal = 7)
private int modifyYeah(int value) {
- return stratus$textOpacity = (int) (((float) (getChatOpen() ? 255 : value)) * (mc.gameSettings.chatOpacity * 0.9F + 0.1F));
+ return chattils$textOpacity = (int) (((float) (getChatOpen() ? 255 : value)) * (mc.gameSettings.chatOpacity * 0.9F + 0.1F));
}
@Redirect(method = "drawChat", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/FontRenderer;drawStringWithShadow(Ljava/lang/String;FFI)I"))
@@ -126,28 +126,28 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
@Inject(method = "drawChat", at = @At("RETURN"))
private void checkStuff(int j2, CallbackInfo ci) {
- if (!stratus$chatCheck && stratus$shouldCopy) {
- stratus$shouldCopy = false;
+ if (!chattils$chatCheck && chattils$shouldCopy) {
+ chattils$shouldCopy = false;
}
}
@Inject(method = "getChatHeight", at = @At("HEAD"), cancellable = true)
private void customHeight_getChatHeight(CallbackInfoReturnable<Integer> cir) {
- if (StratusConfig.INSTANCE.getCustomChatHeight()) cir.setReturnValue(Stratus.INSTANCE.getChatHeight(this.getChatOpen()));
+ if (ChattilsConfig.INSTANCE.getCustomChatHeight()) cir.setReturnValue(Chattils.INSTANCE.getChatHeight(this.getChatOpen()));
}
@Override
public int getRight() {
- return stratus$right;
+ return chattils$right;
}
@Override
public boolean shouldCopy() {
- return stratus$shouldCopy;
+ return chattils$shouldCopy;
}
private void handleChatTabMessage(IChatComponent chatComponent, int chatLineId, int updateCounter, boolean displayOnly, CallbackInfo ci) {
- if (StratusConfig.INSTANCE.getChatTabs()) {
+ if (ChattilsConfig.INSTANCE.getChatTabs()) {
if (!ChatTabs.INSTANCE.shouldRender(chatComponent)) {
percentComplete = 1.0F;
if (chatLineId != 0) {
@@ -166,7 +166,7 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
}
private void drawCopyChatBox(int right, int top) {
- stratus$chatCheck = true;
+ chattils$chatCheck = true;
GlStateManager.enableRescaleNormal();
GlStateManager.enableBlend();
GlStateManager.enableDepth();
@@ -179,7 +179,7 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
GlStateManager.enableBlend();
GlStateManager.blendFunc(770, 771);
GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
- stratus$right = right;
+ chattils$right = right;
Gui.drawModalRectWithCustomSizedTexture(right, top, 0f, 0f, 9, 9, 9, 9);
GlStateManager.disableAlpha();
GlStateManager.disableRescaleNormal();
@@ -188,7 +188,7 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
}
@Override
- public Transferable getStratusChatComponent(int mouseY) {
+ public Transferable getChattilsChatComponent(int mouseY) {
if (this.getChatOpen()) {
ScaledResolution scaledresolution = new ScaledResolution(this.mc);
int i = scaledresolution.getScaleFactor();
@@ -207,7 +207,7 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
ChatLine fullLine = this.getFullMessage(subLine);
if (GuiScreen.isShiftKeyDown()) {
if (fullLine != null) {
- BufferedImage image = Stratus.INSTANCE.screenshotLine(fullLine);
+ BufferedImage image = Chattils.INSTANCE.screenshotLine(fullLine);
if (image != null) RenderHelper.INSTANCE.copyBufferedImageToClipboard(image);
}
return null;
@@ -225,16 +225,16 @@ public abstract class GuiNewChatMixin extends Gui implements GuiNewChatHook {
@Override
public String getPrevText() {
- return stratus$previousText;
+ return chattils$previousText;
}
@Override
public void setPrevText(String prevText) {
- stratus$previousText = prevText;
+ chattils$previousText = prevText;
}
@Override
public int getTextOpacity() {
- return stratus$textOpacity;
+ return chattils$textOpacity;
}
}
diff --git a/src/main/java/com/raeids/stratus/mixin/WyvtilsListenerMixin.java b/src/main/java/cc/woverflow/chattils/mixin/WyvtilsListenerMixin.java
index 768b7c7..13a4167 100644
--- a/src/main/java/com/raeids/stratus/mixin/WyvtilsListenerMixin.java
+++ b/src/main/java/cc/woverflow/chattils/mixin/WyvtilsListenerMixin.java
@@ -1,6 +1,6 @@
-package com.raeids.stratus.mixin;
+package cc.woverflow.chattils.mixin;
-import com.raeids.stratus.utils.RenderHelper;
+import cc.woverflow.chattils.utils.RenderHelper;
import org.spongepowered.asm.mixin.Dynamic;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Pseudo;
@@ -14,7 +14,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
public class WyvtilsListenerMixin {
@Dynamic("Wyvtils")
- @Inject(method = "onStringRendered", at = @At("HEAD"), cancellable = true)
+ @Inject(method = "onStringRendered", at = @At("HEAD"), cancellable = true, remap = false)
private void cancelStringRender(@Coerce Object a, CallbackInfo ci) {
if (RenderHelper.INSTANCE.getBypassWyvtils()) ci.cancel();
}