Load cosmetics on player world join, close #63

Ladysnake · Feb 7, 2021 · 7e05f2e · 7e05f2e
1 parent 598f027
commit 7e05f2e
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Illuminations - Changelog:
 
+### Illuminations 1.4.5 - 1.16.5
+- Illuminations cosmetics will now be reloaded upon a player joining a world, no longer needing to restart the game in order to see changes
+
 ### Illuminations 1.4.4 - 1.16.5
 - Fixed an issue that caused fireflies not to spawn if time is set to something greater than 24000
 - Updated to Vanguard 1.0.5

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ loader_version=0.11.1
 fabric_version=0.30.0+1.16
 
 # Mod Properties
-mod_version = 1.4.4
+mod_version = 1.4.5
 maven_group = io.github.ladysnake
 archives_base_name = illuminations
 
@@ -24,7 +24,7 @@ vanguard_version=1.0.+
 owners = Ladysnake
 license_header = CC-BY-NC-SA+4.0
 curseforge_id = 292908
-curseforge_versions = 1.16.4
+curseforge_versions = 1.16.5
 cf_requirements = fabric-api
 release_type = release
 changelog_url = https://github.com/Ladysnake/Illuminations/blob/main/CHANGELOG.md
diff --git a/src/main/java/ladysnake/illuminations/client/IlluminationsClient.java b/src/main/java/ladysnake/illuminations/client/IlluminationsClient.java
@@ -64,7 +64,7 @@ public class IlluminationsClient implements ClientModInitializer {
     public static final int EYES_VANISHING_DISTANCE = 5;
 
     // illuminations cosmetics
-    private static final String COSMETICS_URL = "https://illuminations.glitch.me/data";
+    private static final String COSMETICS_URL = "https://illuminations.uuid.gg/data";
     private static final Gson COSMETICS_GSON = new GsonBuilder().create();
     static final Type COSMETIC_SELECT_TYPE = new TypeToken<Map<UUID, PlayerCosmeticData>>(){}.getType();
     public static Map<UUID, PlayerCosmeticData> PLAYER_COSMETICS = Collections.emptyMap();
@@ -115,26 +115,7 @@ public void onInitializeClient() {
         Config.load();
 
         // get illuminations player cosmetics
-        CompletableFuture.supplyAsync(() -> {
-            try (Reader reader = new InputStreamReader(new URL(COSMETICS_URL).openStream())) {
-                Map<UUID, PlayerCosmeticData> playerData = COSMETICS_GSON.fromJson(reader, COSMETIC_SELECT_TYPE);
-                return playerData;
-            } catch (MalformedURLException e) {
-                logger.log(Level.ERROR, "Could not get player cosmetics because of malformed URL: " + e.getMessage());
-            } catch (IOException e) {
-                logger.log(Level.ERROR, "Could not get player cosmetics because of I/O Error: " + e.getMessage());
-            }
-
-            return null;
-        }).thenAcceptAsync(playerData -> {
-            if (playerData != null) {
-                PLAYER_COSMETICS = playerData;
-                logger.log(Level.INFO, "Player cosmetics retrieved");
-            } else {
-                PLAYER_COSMETICS = Collections.emptyMap();
-                logger.log(Level.WARN, "Player cosmetics could not be retrieved, cosmetics will be ignored");
-            }
-        }, MinecraftClient.getInstance());
+        loadPlayerCosmetics();
 
         // particles
         FIREFLY = Registry.register(Registry.PARTICLE_TYPE, "illuminations:firefly", FabricParticleTypes.simple(true));
@@ -217,4 +198,28 @@ public void onInitializeClient() {
                 .put("mooncult_crown", new OverheadData(new CrownEntityModel(), "mooncult_crown"))
                 .build();
     }
+
+    public static void loadPlayerCosmetics() {
+        // get illuminations player cosmetics
+        CompletableFuture.supplyAsync(() -> {
+            try (Reader reader = new InputStreamReader(new URL(COSMETICS_URL).openStream())) {
+                Map<UUID, PlayerCosmeticData> playerData = COSMETICS_GSON.fromJson(reader, COSMETIC_SELECT_TYPE);
+                return playerData;
+            } catch (MalformedURLException e) {
+                logger.log(Level.ERROR, "Could not get player cosmetics because of malformed URL: " + e.getMessage());
+            } catch (IOException e) {
+                logger.log(Level.ERROR, "Could not get player cosmetics because of I/O Error: " + e.getMessage());
+            }
+
+            return null;
+        }).thenAcceptAsync(playerData -> {
+            if (playerData != null) {
+                PLAYER_COSMETICS = playerData;
+                logger.log(Level.INFO, "Player cosmetics retrieved");
+            } else {
+                PLAYER_COSMETICS = Collections.emptyMap();
+                logger.log(Level.WARN, "Player cosmetics could not be retrieved, cosmetics will be ignored");
+            }
+        }, MinecraftClient.getInstance());
+    }
 }
diff --git a/src/main/java/ladysnake/illuminations/mixin/ClientWorldMixin.java b/src/main/java/ladysnake/illuminations/mixin/ClientWorldMixin.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableSet;
 import ladysnake.illuminations.client.IlluminationsClient;
 import ladysnake.illuminations.client.data.IlluminationData;
+import net.minecraft.client.network.AbstractClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.profiler.Profiler;
@@ -50,4 +51,9 @@ public void randomBlockDisplayTick(int xCenter, int yCenter, int zCenter, int ra
         }
     }
 
+    @Inject(method = "addPlayer", at = @At(value = "RETURN"))
+    public void addPlayer(int id, AbstractClientPlayerEntity player, CallbackInfo ci) {
+        IlluminationsClient.loadPlayerCosmetics();
+    }
+
 }