virt/Sit
1
0
Fork 0
forked from virt-mirrors/Sit
Code Pull requests Activity

fix merge errors

Browse source
This commit is contained in:
Oth3r 2024-04-10 14:05:36 -05:00
commit d61031b821
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/one/oth3r/sit/Sit.java
View file

@ -16,6 +16,7 @@ import net.minecraft.server.command.CommandManager;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.MutableText; import net.minecraft.text.MutableText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import one.oth3r.sit.file.Config; import one.oth3r.sit.file.Config;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/one/oth3r/sit/SitClient.java
View file

@ -22,6 +22,6 @@ public class SitClient implements ClientModInitializer {
} }
public static CustomPayload sendPackets() { public static CustomPayload sendPackets() {
Gson gson = new GsonBuilder().disableHtmlEscaping().create(); Gson gson = new GsonBuilder().disableHtmlEscaping().create();
return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings())); return new Sit.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings()));
} }
} }