From c78cf32bd47d8c67c15aa482ac323a2d6306fa21 Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 31 Jul 2024 15:13:14 +0200 Subject: [PATCH 1/4] Fix build --- build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 0e1f956c..c5826327 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { dependencies { - classpath 'com.github.dexman545:Outlet:1.3.10' + classpath 'com.github.dexman545:Outlet:1.6.1' } } plugins { @@ -8,9 +8,9 @@ plugins { id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' id 'com.modrinth.minotaur' version '2.+' - id 'org.ajoberstar.reckon' version '0.13.0' + id 'org.ajoberstar.reckon' version '0.13.1' } -apply plugin: 'dex.plugins.outlet' +apply plugin: 'io.github.dexman545.outlet' java { toolchain { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102e..db9a6b82 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From ff45ce3d418b39732579a479e7d512534b038bcc Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 17 Dec 2024 17:55:38 +0100 Subject: [PATCH 2/4] Update hdskins --- gradle.properties | 2 +- .../client/compat/hdskins/MineLPHDSkins.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8885ff12..b65ce847 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,5 +21,5 @@ org.gradle.daemon=false # Dependencies modmenu_version=9.0.0-pre.1 kirin_version=1.17.1+1.20.4 - hd_skins_version=6.12.2+1.20.4 + hd_skins_version=6.12.4+1.20.4 mson_version=1.9.3+1.20.2 diff --git a/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java index d697fb6c..004ce06a 100644 --- a/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java @@ -11,6 +11,7 @@ import com.minelittlepony.hdskins.client.*; import com.minelittlepony.hdskins.client.gui.GuiSkins; import com.minelittlepony.hdskins.client.gui.player.DummyPlayer; import com.minelittlepony.hdskins.client.gui.player.skins.PlayerSkins.PlayerSkin; +import com.minelittlepony.hdskins.client.profile.SkinLoader.ProvidedSkins; import com.minelittlepony.hdskins.profile.SkinType; import com.mojang.authlib.GameProfile; @@ -75,7 +76,7 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { }); } - static Optional getPony(PlayerSkins.Layer layer) { + static Optional getPony(PlayerSkinLayers.Layer layer) { return layer .getSkin(SkinType.SKIN) .map(Pony.getManager()::getPony); @@ -103,8 +104,9 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { if (entity instanceof AbstractClientPlayerEntity player) { return PlayerSkins.of(player) - .map(PlayerSkins::combined) - .map(PlayerSkins.Layer::getProvidedSkinTypes) + .map(PlayerSkins::layers) + .map(PlayerSkinLayers::combined) + .map(PlayerSkinLayers.Layer::getProvidedSkinTypes) .orElseGet(Set::of); } @@ -132,13 +134,16 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { } } - return Optional.of(player).flatMap(PlayerSkins::of).map(PlayerSkins::combined).flatMap(skins -> skins.getSkin(type)); + return Optional.of(player).flatMap(PlayerSkins::of) + .map(PlayerSkins::layers) + .map(PlayerSkinLayers::combined).flatMap(skins -> skins.getSkin(type)); } @Override public Identifier getSkinTexture(GameProfile profile) { return HDSkins.getInstance().getProfileRepository() - .getNow(profile) + .load(profile) + .getNow(ProvidedSkins.EMPTY) .getSkin(SkinType.SKIN) .orElseGet(() -> super.getSkinTexture(profile)); } From ec8f92e151b2fff3a8e664019333660856019212 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 17 Dec 2024 17:59:46 +0100 Subject: [PATCH 3/4] Update hdskins # Conflicts: # gradle.properties --- gradle.properties | 2 +- .../client/compat/hdskins/MineLPHDSkins.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 11e0ed3c..064f9c76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,5 +22,5 @@ org.gradle.daemon=false # Dependencies modmenu_version=8.0.0 kirin_version=1.16.1+1.20.2 - hd_skins_version=6.11.2+1.20.2 + hd_skins_version=6.12.4+1.20.2 mson_version=1.9.3+1.20.2 diff --git a/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java index d697fb6c..004ce06a 100644 --- a/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java +++ b/src/main/java/com/minelittlepony/client/compat/hdskins/MineLPHDSkins.java @@ -11,6 +11,7 @@ import com.minelittlepony.hdskins.client.*; import com.minelittlepony.hdskins.client.gui.GuiSkins; import com.minelittlepony.hdskins.client.gui.player.DummyPlayer; import com.minelittlepony.hdskins.client.gui.player.skins.PlayerSkins.PlayerSkin; +import com.minelittlepony.hdskins.client.profile.SkinLoader.ProvidedSkins; import com.minelittlepony.hdskins.profile.SkinType; import com.mojang.authlib.GameProfile; @@ -75,7 +76,7 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { }); } - static Optional getPony(PlayerSkins.Layer layer) { + static Optional getPony(PlayerSkinLayers.Layer layer) { return layer .getSkin(SkinType.SKIN) .map(Pony.getManager()::getPony); @@ -103,8 +104,9 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { if (entity instanceof AbstractClientPlayerEntity player) { return PlayerSkins.of(player) - .map(PlayerSkins::combined) - .map(PlayerSkins.Layer::getProvidedSkinTypes) + .map(PlayerSkins::layers) + .map(PlayerSkinLayers::combined) + .map(PlayerSkinLayers.Layer::getProvidedSkinTypes) .orElseGet(Set::of); } @@ -132,13 +134,16 @@ public class MineLPHDSkins extends SkinsProxy implements ClientModInitializer { } } - return Optional.of(player).flatMap(PlayerSkins::of).map(PlayerSkins::combined).flatMap(skins -> skins.getSkin(type)); + return Optional.of(player).flatMap(PlayerSkins::of) + .map(PlayerSkins::layers) + .map(PlayerSkinLayers::combined).flatMap(skins -> skins.getSkin(type)); } @Override public Identifier getSkinTexture(GameProfile profile) { return HDSkins.getInstance().getProfileRepository() - .getNow(profile) + .load(profile) + .getNow(ProvidedSkins.EMPTY) .getSkin(SkinType.SKIN) .orElseGet(() -> super.getSkinTexture(profile)); } From 57754d8dec9d2d8ac12dc57a457e789c030f8272 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 5 Jan 2025 12:15:59 +0100 Subject: [PATCH 4/4] Change christmas check to include the 24th - 26th Closes #299 --- .../java/com/minelittlepony/client/model/gear/DeerAntlers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/minelittlepony/client/model/gear/DeerAntlers.java b/src/main/java/com/minelittlepony/client/model/gear/DeerAntlers.java index f566b299..2c0f864d 100644 --- a/src/main/java/com/minelittlepony/client/model/gear/DeerAntlers.java +++ b/src/main/java/com/minelittlepony/client/model/gear/DeerAntlers.java @@ -23,10 +23,9 @@ public class DeerAntlers extends WearableGear { dayChecked = true; Calendar cal = Calendar.getInstance(); dayResult = cal.get(Calendar.MONTH) == Calendar.DECEMBER - && cal.get(Calendar.DAY_OF_MONTH) == 25; + && Math.abs(cal.get(Calendar.DAY_OF_MONTH) - 25) < 2; } - return dayResult; }