Skip to content

Commit 11ddbdd

Browse files
authored
Change from mixin GuiScreen to listen to ClientChatEvent (#187)
* change to mixin chat * convert copy to event * rename method
1 parent 0a9cdde commit 11ddbdd

File tree

3 files changed

+11
-25
lines changed

3 files changed

+11
-25
lines changed

src/main/java/com/cleanroommc/groovyscript/core/mixin/GuiScreenMixin.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/com/cleanroommc/groovyscript/event/EventHandler.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.cleanroommc.groovyscript.GroovyScript;
44
import com.cleanroommc.groovyscript.api.GroovyLog;
5+
import com.cleanroommc.groovyscript.command.CustomClickAction;
56
import com.cleanroommc.groovyscript.compat.WarningScreen;
67
import com.cleanroommc.groovyscript.compat.content.GroovyBlock;
78
import com.cleanroommc.groovyscript.compat.content.GroovyFluid;
@@ -28,6 +29,7 @@
2829
import net.minecraft.item.Item;
2930
import net.minecraft.item.crafting.IRecipe;
3031
import net.minecraft.nbt.NBTTagCompound;
32+
import net.minecraftforge.client.event.ClientChatEvent;
3133
import net.minecraftforge.client.event.GuiOpenEvent;
3234
import net.minecraftforge.client.event.ModelRegistryEvent;
3335
import net.minecraftforge.client.event.TextureStitchEvent;
@@ -109,6 +111,15 @@ public static void playerLogin(PlayerEvent.PlayerLoggedInEvent event) {
109111
}
110112
}
111113

114+
@SubscribeEvent
115+
@SideOnly(Side.CLIENT)
116+
public static void onClientChatEvent(ClientChatEvent event) {
117+
if (event.getOriginalMessage().startsWith(CustomClickAction.PREFIX) &&
118+
CustomClickAction.runActionHook(event.getOriginalMessage().substring(CustomClickAction.PREFIX.length()))) {
119+
event.setCanceled(true);
120+
}
121+
}
122+
112123
@SubscribeEvent
113124
public static void onItemCrafted(PlayerEvent.ItemCraftedEvent event) {
114125
if (event.craftMatrix instanceof InventoryCrafting inventoryCrafting) {

src/main/resources/mixin.groovyscript.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,5 @@
3535
"client": [
3636
"DefaultResourcePackAccessor",
3737
"GuiCreateWorldMixin",
38-
"GuiScreenMixin"
3938
]
4039
}

0 commit comments

Comments
 (0)