From 475d545887e2dcf2e40bceb078546918bcfa3ab7 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 21 Aug 2018 21:18:20 +0200 Subject: [PATCH] Split up the GuiSkins by concern (There is now a skin chooser and an uploader, and the gui only has gui stuff) --- .../java/com/minelittlepony/gui/Button.java | 12 +- .../java/com/minelittlepony/gui/Checkbox.java | 12 +- .../java/com/minelittlepony/gui/GameGui.java | 8 +- .../minelittlepony/gui/IGuiTooltipped.java | 2 + .../com/voxelmodpack/hdskins/SkinChooser.java | 134 +++++ .../voxelmodpack/hdskins/SkinUploader.java | 284 +++++++++++ .../hdskins/gui/EntityPlayerModel.java | 12 +- .../voxelmodpack/hdskins/gui/GuiSkins.java | 466 +++++------------- .../hdskins/skins/CallableFutures.java | 8 + .../hdskins/skins/LegacySkinServer.java | 7 + .../hdskins/skins/SkinServer.java | 2 +- .../hdskins/gui/EntityPonyModel.java | 5 +- .../hdskins/gui/GuiSkinsMineLP.java | 15 +- 13 files changed, 601 insertions(+), 366 deletions(-) create mode 100644 src/hdskins/java/com/voxelmodpack/hdskins/SkinChooser.java create mode 100644 src/hdskins/java/com/voxelmodpack/hdskins/SkinUploader.java diff --git a/src/hdskins/java/com/minelittlepony/gui/Button.java b/src/hdskins/java/com/minelittlepony/gui/Button.java index 1fbc88f1..8702b321 100644 --- a/src/hdskins/java/com/minelittlepony/gui/Button.java +++ b/src/hdskins/java/com/minelittlepony/gui/Button.java @@ -7,6 +7,9 @@ import net.minecraft.client.gui.GuiButton; public class Button extends GuiButton implements IActionable, IGuiTooltipped { + private int tipX = 0; + private int tipY = 0; + protected IGuiAction