forked from virt-mirrors/Sit
fix merge errors
This commit is contained in:
parent
c6fb594d1f
commit
d61031b821
2 changed files with 2 additions and 1 deletions
|
@ -16,6 +16,7 @@ import net.minecraft.server.command.CommandManager;
|
|||
import net.minecraft.server.network.ServerPlayerEntity;
|
||||
import net.minecraft.text.MutableText;
|
||||
import net.minecraft.text.Text;
|
||||
import net.minecraft.util.Identifier;
|
||||
import one.oth3r.sit.file.Config;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
|
|
@ -22,6 +22,6 @@ public class SitClient implements ClientModInitializer {
|
|||
}
|
||||
public static CustomPayload sendPackets() {
|
||||
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
|
||||
return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings()));
|
||||
return new Sit.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings()));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue