Fix Text Field Input & WurstTranslator

Author: cev-api

README.md

@@ -55,6 +55,7 @@ I’m pleased to note that many of the features and improvements below are compl
 - AntiBlast
 - [NiceWurst](https://github.com/cev-api/NiceWurst)
 - SeedMapperHelper
+- SpearAssist
 - LootSearch
 - OfflineSettings
 - TargetPlace
@@ -377,9 +378,9 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
   - Hold - While charging you are constantly boosting forward whenever you press the left click
 - Your player can optionally stay grounded when boosting as to avoid flying off into the distance on each attack
 - Highlighting: You can highlight near and far entities within your attack range. Near meaning the distance you can jab at them and far the distance you can charge at them. Set to 7 for near and 8.5 blocks for far.
-- Your charge is automatically and constantly resumed so you can forever hold right click. It will be noisy but even if the spear is pointed down you will still be able to attack. 
+- Your charge is automatically and constantly resumed (no cooldown) so you can forever hold right click. It will be noisy but even if the spear is pointed down you will still be able to attack. 
 - You can optionally allow aim assist to work whilst holding right click.
-- Your jab attack will auto hit once the timeout has expired so long as you're hitting an entity.
+- Your jab attack will continue to auto hit once the cooldown has expired so long as you're hitting an entity.
 
 ## What’s changed or improved in this fork?
 

src/main/java/net/wurstclient/WurstTranslator.java

@@ -30,7 +30,6 @@
 import net.minecraft.server.packs.resources.Resource;
 import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
-import com.google.common.collect.Lists;
 
 public class WurstTranslator implements ResourceManagerReloadListener
 {
@@ -235,7 +234,8 @@ private boolean isBuiltInWurstResourcePack(Resource resource)
 		if(knownPack == null)
 			return false;
 
-		if(!"fabric".equals(knownPack.namespace()))
+		String namespace = knownPack.namespace();
+		if(!"fabric".equals(namespace) && !"vanilla".equals(namespace))
 			return false;
 
 		String id = knownPack.id();

src/main/java/net/wurstclient/clickgui/components/TextFieldEditButton.java

@@ -151,13 +151,18 @@ else if(hBox && !editing)
 		int txtColor = GUI.getTxtColor();
 		context.guiRenderState.up();
 		context.drawString(TR, setting.getName(), x1, y1 + 2, txtColor, false);
-		String value = setting.getValue();
-		int maxWidth = getWidth() - TR.width("...") - 2;
-		int maxLength =
-			TR.getSplitter().plainIndexAtWidth(value, maxWidth, Style.EMPTY);
-		if(maxLength < value.length())
-			value = value.substring(0, maxLength) + "...";
-		context.drawString(TR, value, x1 + 2, boxY1 + 2, txtColor, false);
+		if(editing)
+			inlineField.render(context, mouseX, mouseY, partialTicks);
+		else
+		{
+			String value = setting.getValue();
+			int maxWidth = getWidth() - TR.width("...") - 2;
+			int maxLength = TR.getSplitter().plainIndexAtWidth(value, maxWidth,
+				Style.EMPTY);
+			if(maxLength < value.length())
+				value = value.substring(0, maxLength) + "...";
+			context.drawString(TR, value, x1 + 2, boxY1 + 2, txtColor, false);
+		}
 	}
 
 	@Override

src/main/java/net/wurstclient/hacks/SpearAssistHack.java

@@ -54,21 +54,21 @@ public final class SpearAssistHack extends Hack
 			"Extra distance to travel each time you start holding attack.", 4,
 			0, 10, 0.1, ValueDisplay.DECIMAL.withSuffix(" blocks"));
 
-	private final SliderSetting nearHighlightRange =
-		new SliderSetting("Near highlight range",
-			"Distance where targets switch to the near color.", 7, 4, 10, 0.5,
-			ValueDisplay.DECIMAL.withSuffix(" blocks"));
-	private final SliderSetting farHighlightRange =
-		new SliderSetting("Far highlight range",
-			"Distance where targets switch to the far color.", 8.5, 5, 20, 0.5,
-			ValueDisplay.DECIMAL.withSuffix(" blocks"));
+	private final SliderSetting nearHighlightRange =
+		new SliderSetting("Near highlight range",
+			"Distance where targets switch to the near color.", 7, 4, 10, 0.5,
+			ValueDisplay.DECIMAL.withSuffix(" blocks"));
+	private final SliderSetting farHighlightRange =
+		new SliderSetting("Far highlight range",
+			"Distance where targets switch to the far color.", 8.5, 5, 20, 0.5,
+			ValueDisplay.DECIMAL.withSuffix(" blocks"));
 
 	private final ColorSetting nearHighlightColor =
 		new ColorSetting("Near highlight color",
 			"Color used when targets are nearby.", Color.YELLOW);
-	private final ColorSetting farHighlightColor =
-		new ColorSetting("Far highlight color",
-			"Color used when targets are far away.", new Color(0, 255, 0));
+	private final ColorSetting farHighlightColor =
+		new ColorSetting("Far highlight color",
+			"Color used when targets are far away.", new Color(0, 255, 0));
 
 	private final CheckboxSetting stayGrounded = new CheckboxSetting(
 		"Stay grounded",

src/main/java/net/wurstclient/mixin/OfflineSettingsNetworkMixin.java

@@ -12,27 +12,14 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
-import net.minecraft.client.multiplayer.CommonListenerCookie;
-import net.minecraft.network.Connection;
-import net.minecraft.network.TickablePacketListener;
-import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.wurstclient.WurstClient;
 import net.wurstclient.hacks.OfflineSettingsHack;
 import net.minecraft.network.DisconnectionDetails;
 
 @Mixin(value = ClientCommonPacketListenerImpl.class, remap = false)
 public abstract class OfflineSettingsNetworkMixin
-	extends ClientCommonPacketListenerImpl
-	implements TickablePacketListener, ClientGamePacketListener
 {
-	private OfflineSettingsNetworkMixin(Minecraft client, Connection connection,
-		CommonListenerCookie connectionState)
-	{
-		super(client, connection, connectionState);
-	}
-	
 	@Inject(at = @At("TAIL"),
 		method = "onDisconnect(Lnet/minecraft/network/DisconnectionDetails;)V",
 		remap = false)

src/main/java/net/wurstclient/mixin/ScreenRenderMixin.java

@@ -16,21 +16,28 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Renderable;
+import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.screens.DisconnectedScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.FormattedCharSequence;
 import net.wurstclient.mixinterface.LoginOverlayAccessor;
 
 @Mixin(value = Screen.class, remap = false)
-public abstract class ScreenRenderMixin extends Screen
+public abstract class ScreenRenderMixin extends AbstractContainerEventHandler
+	implements Renderable
 {
 	@Shadow
 	protected Minecraft minecraft;
+	@Shadow
+	protected int width;
+	@Shadow
+	protected int height;
 
 	protected ScreenRenderMixin(Component title)
 	{
-		super(title);
+		
 	}
 
 	@Inject(at = @At("TAIL"),

src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java

@@ -15,6 +15,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
@@ -420,4 +421,13 @@ protected void onMouseRelease(double x, double y, int button)
 	{
 
 	}
+	
+	@Override
+	public boolean charTyped(CharacterEvent event)
+	{
+		if(searchBar != null && searchBar.charTyped(event))
+			return true;
+		
+		return super.charTyped(event);
+	}
 }

src/main/java/net/wurstclient/navigator/NavigatorScreen.java

@@ -10,6 +10,7 @@
 import java.awt.Rectangle;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.input.CharacterEvent;
 import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
@@ -44,10 +45,24 @@ protected final void init()
 	@Override
 	public final boolean keyPressed(KeyEvent context)
 	{
+		ClickGui gui = WurstClient.INSTANCE.getGui();
+		if(gui.handleKeyPressed(context))
+			return true;
+		
 		onKeyPress(context);
 		return super.keyPressed(context);
 	}
 
+	@Override
+	public boolean charTyped(CharacterEvent event)
+	{
+		ClickGui gui = WurstClient.INSTANCE.getGui();
+		if(gui.handleCharTyped(event))
+			return true;
+		
+		return super.charTyped(event);
+	}
+	
 	@Override
 	public final boolean mouseClicked(MouseButtonEvent context,
 		boolean doubleClick)