R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 1.19.4 into 1.20

Browse Source
This commit is contained in:
embeddedt 2023-08-07 21:53:31 -04:00
commit 8f31048619
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java
View File

@ -1,13 +1,15 @@
package org.embeddedt.modernfix.forge.init; package org.embeddedt.modernfix.forge.init;
import com.mojang.blaze3d.platform.InputConstants; import com.mojang.blaze3d.platform.InputConstants;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import net.minecraft.client.KeyMapping; import net.minecraft.client.KeyMapping;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.DebugScreenOverlay; import net.minecraft.client.gui.components.DebugScreenOverlay;
import net.minecraft.commands.CommandSourceStack;
import net.minecraftforge.client.ConfigScreenHandler; import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.client.event.ClientChatEvent;
import net.minecraftforge.client.event.CustomizeGuiOverlayEvent; import net.minecraftforge.client.event.CustomizeGuiOverlayEvent;
import net.minecraftforge.client.event.RecipesUpdatedEvent; import net.minecraftforge.client.event.RecipesUpdatedEvent;
import net.minecraftforge.client.event.RegisterClientCommandsEvent;
import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
import net.minecraftforge.client.gui.overlay.ForgeGui; import net.minecraftforge.client.gui.overlay.ForgeGui;
import net.minecraftforge.client.settings.KeyConflictContext; import net.minecraftforge.client.settings.KeyConflictContext;
@ -54,13 +56,12 @@ public class ModernFixClientForge {
} }
@SubscribeEvent(priority = EventPriority.LOW) @SubscribeEvent(priority = EventPriority.LOW)
public void onClientChat(ClientChatEvent event) { public void onClientChat(RegisterClientCommandsEvent event) {
if(event.getMessage() != null && event.getMessage().trim().equals("/mfrc")) { event.getDispatcher().register(LiteralArgumentBuilder.<CommandSourceStack>literal("mfrc")
NightConfigFixer.runReloads(); .executes(context -> {
event.setCanceled(true); NightConfigFixer.runReloads();
// add it to chat history return 1;
Minecraft.getInstance().gui.getChat().addRecentChat(event.getMessage()); }));
}
} }
private static final List<String> brandingList = new ArrayList<>(); private static final List<String> brandingList = new ArrayList<>();

3
forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java
View File

@ -59,8 +59,7 @@ public class ModernFixForge {
@SubscribeEvent @SubscribeEvent
public void onCommandRegister(RegisterCommandsEvent event) { public void onCommandRegister(RegisterCommandsEvent event) {
// Register separate commands since redirecting doesn't work without arguments for(String name : new String[] { "mfsrc"}) {
for(String name : new String[] { "mfrc", "mfsrc"}) {
event.getDispatcher().register(LiteralArgumentBuilder.<CommandSourceStack>literal(name) event.getDispatcher().register(LiteralArgumentBuilder.<CommandSourceStack>literal(name)
.requires(source -> source.hasPermission(3)) .requires(source -> source.hasPermission(3))
.executes(context -> { .executes(context -> {