mirror/Wurst7
0
0
Fork 0
mirror of https://github.com/Wurst-Imperium/Wurst7.git synced 2024-09-19 17:02:13 +02:00
Code

Update to Minecraft 1.14.4

Browse Source
This commit is contained in:
Alexander01998 2019-07-21 23:45:13 +02:00
parent 93d813959b
commit 86774f417e
10 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft_Client.launch
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/Wurst MC 1.14.2"/>
<listEntry value="/Wurst MC 1.14.4"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.fabricmc.loader.launch.knot.KnotClient"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=" --assetIndex &quot;1.14.2-1.14&quot; --assetsDir &quot;C:\Users\Alexander\.gradle\caches\fabric-loom\assets&quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Wurst MC 1.14.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--assetIndex &quot;1.14.4-1.14&quot; --assetsDir &quot;C:\Users\Alexander\.gradle\caches\fabric-loom\assets&quot;"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Wurst MC 1.14.4"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfabric.development=true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
</launchConfiguration>

5
Minecraft_Server.launch
View File

@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/Wurst MC 1.14.2"/>
<listEntry value="/Wurst MC 1.14.4"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.fabricmc.loader.launch.knot.KnotServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Wurst MC 1.14.2"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Wurst MC 1.14.4"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfabric.development=true"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc}/run"/>
</launchConfiguration>

2
build.gradle
View File

@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '0.2.2-SNAPSHOT'
id 'fabric-loom' version '0.2.3-SNAPSHOT'
id 'maven-publish'
}

10
gradle.properties
View File

@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.14.2
yarn_mappings=1.14.2+build.2
loader_version=0.4.8+build.154
minecraft_version=1.14.4
yarn_mappings=1.14.4+build.2
loader_version=0.4.8+build.157
# Mod Properties
mod_version = v7.0-MC1.14.2
mod_version = v7.0-MC1.14.4
maven_group = net.wurstclient
archives_base_name = Wurst-Client
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric
fabric_version=0.3.0+build.175
fabric_version=0.3.0+build.200

4
src/main/java/net/wurstclient/clickgui/ClickGuiScreen.java
View File

@ -8,7 +8,7 @@
package net.wurstclient.clickgui;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.text.LiteralText;
public final class ClickGuiScreen extends Screen
{
@ -16,7 +16,7 @@ public final class ClickGuiScreen extends Screen
public ClickGuiScreen(ClickGui gui)
{
super(new TextComponent(""));
super(new LiteralText(""));
this.gui = gui;
}

4
src/main/java/net/wurstclient/clickgui/EditSliderScreen.java
View File

@ -13,7 +13,7 @@ import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.text.LiteralText;
import net.wurstclient.settings.SliderSetting;
import net.wurstclient.settings.SliderSetting.ValueDisplay;
import net.wurstclient.util.MathUtils;
@ -28,7 +28,7 @@ public final class EditSliderScreen extends Screen
public EditSliderScreen(Screen prevScreen, SliderSetting slider)
{
super(new TextComponent(""));
super(new LiteralText(""));
this.prevScreen = prevScreen;
this.slider = slider;
}

2
src/main/java/net/wurstclient/commands/AnnoyCmd.java
View File

@ -54,7 +54,7 @@ public final class AnnoyCmd extends Command implements ChatInputListener
ChatUtils.message("Now annoying " + target + ".");
ClientPlayerEntity player = MC.player;
if(player != null && target.equals(player.getName().getText()))
if(player != null && target.equals(player.getName().asString()))
ChatUtils.warning("Annoying yourself is a bad idea!");
WURST.getEventManager().add(ChatInputListener.class, this);

10
src/main/java/net/wurstclient/events/ChatInputListener.java
View File

@ -11,7 +11,7 @@ import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.gui.hud.ChatHudLine;
import net.minecraft.network.chat.Component;
import net.minecraft.text.Text;
import net.wurstclient.event.CancellableEvent;
import net.wurstclient.event.Listener;
@ -22,21 +22,21 @@ public interface ChatInputListener extends Listener
public static class ChatInputEvent
extends CancellableEvent<ChatInputListener>
{
private Component component;
private Text component;
private List<ChatHudLine> chatLines;
public ChatInputEvent(Component component, List<ChatHudLine> chatLines)
public ChatInputEvent(Text component, List<ChatHudLine> chatLines)
{
this.component = component;
this.chatLines = chatLines;
}
public Component getComponent()
public Text getComponent()
{
return component;
}
public void setComponent(Component component)
public void setComponent(Text component)
{
this.component = component;
}

21
src/main/java/net/wurstclient/mixin/ChatHudMixin.java
View File

@ -20,7 +20,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawableHelper;
import net.minecraft.client.gui.hud.ChatHud;
import net.minecraft.client.gui.hud.ChatHudLine;
import net.minecraft.network.chat.Component;
import net.minecraft.text.Text;
import net.wurstclient.WurstClient;
import net.wurstclient.events.ChatInputListener.ChatInputEvent;
@ -35,28 +35,27 @@ public class ChatHudMixin extends DrawableHelper
private MinecraftClient client;
@Inject(at = @At("HEAD"),
method = "addMessage(Lnet/minecraft/network/chat/Component;I)V",
method = "addMessage(Lnet/minecraft/text/Text;I)V",
cancellable = true)
private void onAddMessage(Component chatComponent, int chatLineId,
CallbackInfo ci)
private void onAddMessage(Text chatText, int chatLineId, CallbackInfo ci)
{
ChatInputEvent event = new ChatInputEvent(chatComponent, messages);
ChatInputEvent event = new ChatInputEvent(chatText, messages);
WurstClient.INSTANCE.getEventManager().fire(event);
if(event.isCancelled())
ci.cancel();
chatComponent = event.getComponent();
shadow$addMessage(chatComponent, chatLineId,
client.inGameHud.getTicks(), false);
chatText = event.getComponent();
shadow$addMessage(chatText, chatLineId, client.inGameHud.getTicks(),
false);
LOGGER.info("[CHAT] {}", chatComponent.getString()
.replaceAll("\r", "\\\\r").replaceAll("\n", "\\\\n"));
LOGGER.info("[CHAT] {}", chatText.getString().replaceAll("\r", "\\\\r")
.replaceAll("\n", "\\\\n"));
ci.cancel();
}
@Shadow
private void shadow$addMessage(Component component_1, int int_1, int int_2,
private void shadow$addMessage(Text text_1, int int_1, int int_2,
boolean boolean_1)
{

10
src/main/java/net/wurstclient/util/ChatUtils.java
View File

@ -9,8 +9,8 @@ package net.wurstclient.util;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.hud.ChatHud;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text;
import net.wurstclient.WurstClient;
public enum ChatUtils
@ -35,19 +35,19 @@ public enum ChatUtils
ChatUtils.enabled = enabled;
}
public static void component(Component component)
public static void component(Text component)
{
if(!enabled)
return;
ChatHud chatHud = MC.inGameHud.getChatHud();
TextComponent prefix = new TextComponent(WURST_PREFIX);
LiteralText prefix = new LiteralText(WURST_PREFIX);
chatHud.addMessage(prefix.append(component));
}
public static void message(String message)
{
component(new TextComponent(message));
component(new LiteralText(message));
}
public static void warning(String message)