From 048c3a5fb7203df1b7b4f05ba73034fe2814fd45 Mon Sep 17 00:00:00 2001
From: Ash <ash@lumine.io>
Date: Wed, 16 Aug 2023 19:42:23 -0600
Subject: [PATCH] Updated to latest PlayerAnimator to fix issues on 1.20.1
Updated to latest LumineUtils
---
.../java/io/lumine/cosmetics/compat/LumineCoreCompat.java | 4 ++--
.../java/io/lumine/cosmetics/players/ProfileManager.java | 2 +-
.../java/io/lumine/cosmetics/storage/sql/SqlStorage.java | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/plugin/src/main/java/io/lumine/cosmetics/compat/LumineCoreCompat.java b/plugin/src/main/java/io/lumine/cosmetics/compat/LumineCoreCompat.java
index f23ead9..1bf4ca4 100644
--- a/plugin/src/main/java/io/lumine/cosmetics/compat/LumineCoreCompat.java
+++ b/plugin/src/main/java/io/lumine/cosmetics/compat/LumineCoreCompat.java
@@ -46,7 +46,7 @@ public class LumineCoreCompat {
public void unload() {}
@Override
- public Promise<Optional<Profile>> load(UUID uuid) {
+ public Promise<Optional<Profile>> load(UUID uuid, int subprofile) {
final Promise<Optional<Profile>> promise = Promise.empty();
core.getProfiles().getProfile(uuid).thenAcceptAsync(maybeCoreProfile -> {
@@ -60,7 +60,7 @@ public class LumineCoreCompat {
}
@Override
- public Promise<Optional<Profile>> loadByName(String name) {
+ public Promise<Optional<Profile>> loadByName(String name, int subprofile) {
final Promise<Optional<Profile>> promise = Promise.empty();
core.getProfiles().getProfile(name).thenAcceptAsync(maybeCoreProfile -> {
diff --git a/plugin/src/main/java/io/lumine/cosmetics/players/ProfileManager.java b/plugin/src/main/java/io/lumine/cosmetics/players/ProfileManager.java
index 3315bcd..dc5c1ec 100644
--- a/plugin/src/main/java/io/lumine/cosmetics/players/ProfileManager.java
+++ b/plugin/src/main/java/io/lumine/cosmetics/players/ProfileManager.java
@@ -57,7 +57,7 @@ public class ProfileManager extends PlayerRepository<MCCosmeticsPlugin,Profile>
}
@Override
- public Profile createProfile(UUID id, String name) {
+ public Profile createProfile(UUID id, String name, int subprofile) {
return new Profile(id,name);
}
diff --git a/plugin/src/main/java/io/lumine/cosmetics/storage/sql/SqlStorage.java b/plugin/src/main/java/io/lumine/cosmetics/storage/sql/SqlStorage.java
index 9387bc1..ac5c0f2 100644
--- a/plugin/src/main/java/io/lumine/cosmetics/storage/sql/SqlStorage.java
+++ b/plugin/src/main/java/io/lumine/cosmetics/storage/sql/SqlStorage.java
@@ -43,7 +43,7 @@ public class SqlStorage<MCCosmeticsPlugin,CosmeticsProfile> extends SqlPlayerSto
}
@Override
- public Promise<Optional<io.lumine.cosmetics.players.Profile>> load(final UUID uuid) {
+ public Promise<Optional<io.lumine.cosmetics.players.Profile>> load(final UUID uuid, int subprofile) {
return Promise.supplyingDelayedAsync(() -> {
var connection = getConnector().open();
@@ -55,7 +55,7 @@ public class SqlStorage<MCCosmeticsPlugin,CosmeticsProfile> extends SqlPlayerSto
return Optional.empty();
}
- var profile = manager.createProfile(UUID.fromString(fetchProfile.getUuid()), fetchProfile.getName());
+ var profile = manager.createProfile(UUID.fromString(fetchProfile.getUuid()), fetchProfile.getName(), 0);
profile.loadFromSql(fetchProfile);
@@ -64,7 +64,7 @@ public class SqlStorage<MCCosmeticsPlugin,CosmeticsProfile> extends SqlPlayerSto
}
@Override
- public Promise<Optional<io.lumine.cosmetics.players.Profile>> loadByName(String name) {
+ public Promise<Optional<io.lumine.cosmetics.players.Profile>> loadByName(String name, int subprofile) {
return Promise.supplyingAsync(() -> {
var connection = getConnector().open();
@@ -76,7 +76,7 @@ public class SqlStorage<MCCosmeticsPlugin,CosmeticsProfile> extends SqlPlayerSto
return Optional.empty();
}
- var profile = manager.createProfile(UUID.fromString(fetchProfile.getUuid()), fetchProfile.getName());
+ var profile = manager.createProfile(UUID.fromString(fetchProfile.getUuid()), fetchProfile.getName(), 0);
profile.loadFromSql(fetchProfile);
--
GitLab