mirror of
https://github.com/HMCL-dev/HMCL.git
synced 2025-09-16 23:37:14 -04:00
chore: cleanup. Closes #989.
This commit is contained in:
parent
cd030c1de0
commit
c60df2c26b
@ -1,15 +1,16 @@
|
|||||||
package moe.mickey.minecraft.skin.fx;
|
package moe.mickey.minecraft.skin.fx;
|
||||||
|
|
||||||
|
import javafx.event.Event;
|
||||||
|
import javafx.event.EventHandler;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
import javafx.event.Event;
|
|
||||||
import javafx.event.EventHandler;
|
|
||||||
|
|
||||||
public final class FunctionHelper {
|
public final class FunctionHelper {
|
||||||
|
|
||||||
private FunctionHelper() {
|
private FunctionHelper() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
package moe.mickey.minecraft.skin.fx;
|
package moe.mickey.minecraft.skin.fx;
|
||||||
|
|
||||||
|
import javafx.event.ActionEvent;
|
||||||
|
import javafx.event.EventHandler;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import javafx.event.ActionEvent;
|
|
||||||
import javafx.event.EventHandler;
|
|
||||||
|
|
||||||
public class SkinAnimation {
|
public class SkinAnimation {
|
||||||
|
|
||||||
protected int weight, left;
|
protected int weight, left;
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package moe.mickey.minecraft.skin.fx;
|
package moe.mickey.minecraft.skin.fx;
|
||||||
|
|
||||||
|
import javafx.animation.AnimationTimer;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import javafx.animation.AnimationTimer;
|
|
||||||
|
|
||||||
public class SkinAnimationPlayer {
|
public class SkinAnimationPlayer {
|
||||||
|
|
||||||
protected final Random random = new Random();
|
protected final Random random = new Random();
|
||||||
|
@ -166,8 +166,6 @@ public class SkinCanvas extends Group {
|
|||||||
bindMaterial((Group) node);
|
bindMaterial((Group) node);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected Group createPlayerModel() {
|
protected Group createPlayerModel() {
|
||||||
head.setTranslateY(-(bodyInside.getHeight() + headInside.getHeight()) / 2);
|
head.setTranslateY(-(bodyInside.getHeight() + headInside.getHeight()) / 2);
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ public class SkinCube extends MeshView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int[] createFaces() {
|
public static int[] createFaces() {
|
||||||
int faces[] = new int[]{
|
int[] faces = new int[]{
|
||||||
// TOP
|
// TOP
|
||||||
5, 0, 4, 1, 0, 5, //P5,T0, P4,T1, P0,T5
|
5, 0, 4, 1, 0, 5, //P5,T0, P4,T1, P0,T5
|
||||||
5, 0, 0, 5, 1, 4, //P5,T0, P0,T5, P1,T4
|
5, 0, 0, 5, 1, 4, //P5,T0, P0,T5, P1,T4
|
||||||
|
@ -1,18 +1,20 @@
|
|||||||
package moe.mickey.minecraft.skin.fx;
|
package moe.mickey.minecraft.skin.fx;
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
import javax.imageio.ImageIO;
|
|
||||||
|
|
||||||
import javafx.embed.swing.SwingFXUtils;
|
import javafx.embed.swing.SwingFXUtils;
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.image.Image;
|
||||||
import javafx.scene.image.PixelReader;
|
import javafx.scene.image.PixelReader;
|
||||||
import javafx.scene.image.PixelWriter;
|
import javafx.scene.image.PixelWriter;
|
||||||
import javafx.scene.image.WritableImage;
|
import javafx.scene.image.WritableImage;
|
||||||
|
|
||||||
public interface SkinHelper {
|
import javax.imageio.ImageIO;
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public final class SkinHelper {
|
||||||
|
|
||||||
|
private SkinHelper() {
|
||||||
|
}
|
||||||
|
|
||||||
public static class PixelCopyer {
|
public static class PixelCopyer {
|
||||||
|
|
||||||
|
@ -1,8 +1,5 @@
|
|||||||
package moe.mickey.minecraft.skin.fx;
|
package moe.mickey.minecraft.skin.fx;
|
||||||
|
|
||||||
import java.util.function.BiConsumer;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
import javafx.geometry.Point2D;
|
import javafx.geometry.Point2D;
|
||||||
import javafx.scene.Group;
|
import javafx.scene.Group;
|
||||||
import javafx.scene.image.Image;
|
import javafx.scene.image.Image;
|
||||||
@ -12,6 +9,9 @@ import javafx.scene.paint.Material;
|
|||||||
import javafx.scene.paint.PhongMaterial;
|
import javafx.scene.paint.PhongMaterial;
|
||||||
import javafx.scene.shape.Box;
|
import javafx.scene.shape.Box;
|
||||||
|
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class SkinMultipleCubes extends Group {
|
public class SkinMultipleCubes extends Group {
|
||||||
|
|
||||||
public static class Face extends Group {
|
public static class Face extends Group {
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
package moe.mickey.minecraft.skin.fx;
|
package moe.mickey.minecraft.skin.fx;
|
||||||
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
import javafx.animation.Transition;
|
import javafx.animation.Transition;
|
||||||
import javafx.beans.value.WritableValue;
|
import javafx.beans.value.WritableValue;
|
||||||
import javafx.util.Duration;
|
import javafx.util.Duration;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Function;
|
||||||
|
|
||||||
public class SkinTransition extends Transition {
|
public class SkinTransition extends Transition {
|
||||||
|
|
||||||
protected Function<Double, Double> expression;
|
protected Function<Double, Double> expression;
|
||||||
|
@ -22,17 +22,12 @@ import javafx.beans.property.StringProperty;
|
|||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import javafx.scene.control.Label;
|
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.VBox;
|
import javafx.scene.layout.VBox;
|
||||||
import javafx.scene.paint.Color;
|
|
||||||
import javafx.scene.text.Text;
|
import javafx.scene.text.Text;
|
||||||
import javafx.scene.text.TextFlow;
|
import javafx.scene.text.TextFlow;
|
||||||
import org.jackhuang.hmcl.setting.Theme;
|
import org.jackhuang.hmcl.setting.Theme;
|
||||||
import org.jackhuang.hmcl.ui.SVG;
|
import org.jackhuang.hmcl.ui.SVG;
|
||||||
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
|
||||||
|
|
||||||
import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
|
|
||||||
|
|
||||||
public class HintPane extends VBox {
|
public class HintPane extends VBox {
|
||||||
private final Text label = new Text();
|
private final Text label = new Text();
|
||||||
|
@ -58,7 +58,6 @@ import org.jackhuang.hmcl.util.AggregatedObservableList;
|
|||||||
import org.jackhuang.hmcl.util.StringUtils;
|
import org.jackhuang.hmcl.util.StringUtils;
|
||||||
import org.jackhuang.hmcl.util.i18n.I18n;
|
import org.jackhuang.hmcl.util.i18n.I18n;
|
||||||
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
import org.jackhuang.hmcl.util.javafx.BindingMapping;
|
||||||
import org.jackhuang.hmcl.util.versioning.VersionNumber;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
@ -30,7 +30,6 @@ import javafx.scene.layout.VBox;
|
|||||||
import org.jackhuang.hmcl.event.EventBus;
|
import org.jackhuang.hmcl.event.EventBus;
|
||||||
import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
|
import org.jackhuang.hmcl.event.RefreshingVersionsEvent;
|
||||||
import org.jackhuang.hmcl.game.HMCLGameRepository;
|
import org.jackhuang.hmcl.game.HMCLGameRepository;
|
||||||
import org.jackhuang.hmcl.game.Version;
|
|
||||||
import org.jackhuang.hmcl.setting.Profile;
|
import org.jackhuang.hmcl.setting.Profile;
|
||||||
import org.jackhuang.hmcl.setting.Profiles;
|
import org.jackhuang.hmcl.setting.Profiles;
|
||||||
import org.jackhuang.hmcl.ui.*;
|
import org.jackhuang.hmcl.ui.*;
|
||||||
@ -40,11 +39,8 @@ import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
|
|||||||
import org.jackhuang.hmcl.ui.profile.ProfileListItem;
|
import org.jackhuang.hmcl.ui.profile.ProfileListItem;
|
||||||
import org.jackhuang.hmcl.ui.profile.ProfilePage;
|
import org.jackhuang.hmcl.ui.profile.ProfilePage;
|
||||||
import org.jackhuang.hmcl.util.javafx.MappedObservableList;
|
import org.jackhuang.hmcl.util.javafx.MappedObservableList;
|
||||||
import org.jackhuang.hmcl.util.versioning.VersionNumber;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Comparator;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
@ -17,7 +17,17 @@
|
|||||||
*/
|
*/
|
||||||
package org.jackhuang.hmcl.util;
|
package org.jackhuang.hmcl.util;
|
||||||
|
|
||||||
import java.io.*;
|
import com.google.gson.JsonParseException;
|
||||||
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
|
||||||
|
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.FileUtils;
|
||||||
|
import org.jackhuang.hmcl.util.io.IOUtils;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.io.RandomAccessFile;
|
||||||
import java.net.URLConnection;
|
import java.net.URLConnection;
|
||||||
import java.nio.channels.Channels;
|
import java.nio.channels.Channels;
|
||||||
import java.nio.channels.FileChannel;
|
import java.nio.channels.FileChannel;
|
||||||
@ -32,17 +42,9 @@ import java.util.concurrent.locks.Lock;
|
|||||||
import java.util.concurrent.locks.ReadWriteLock;
|
import java.util.concurrent.locks.ReadWriteLock;
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
import java.util.function.Supplier;
|
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import com.google.gson.JsonParseException;
|
|
||||||
import com.google.gson.annotations.SerializedName;
|
|
||||||
import org.jackhuang.hmcl.util.function.ExceptionalSupplier;
|
|
||||||
import org.jackhuang.hmcl.util.gson.JsonUtils;
|
|
||||||
import org.jackhuang.hmcl.util.io.FileUtils;
|
|
||||||
import org.jackhuang.hmcl.util.io.IOUtils;
|
|
||||||
|
|
||||||
import static java.nio.charset.StandardCharsets.UTF_8;
|
import static java.nio.charset.StandardCharsets.UTF_8;
|
||||||
import static org.jackhuang.hmcl.util.Logging.LOG;
|
import static org.jackhuang.hmcl.util.Logging.LOG;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user