From 46997884727062b578fc50cce241ea762f039a1e Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 27 Aug 2022 12:33:53 +0200 Subject: [PATCH] 1.19 -> 1.19.2 --- gradle.properties | 12 ++++++------ .../unicopia/entity/ButterflyEntity.java | 2 +- .../unicopia/entity/FloatingArtefactEntity.java | 2 +- .../entity/effect/SunBlindnessStatusEffect.java | 2 +- .../unicopia/entity/player/PlayerCharmTracker.java | 2 +- .../entity/player/dummy/DummyClientPlayerEntity.java | 2 +- .../com/minelittlepony/unicopia/item/UItems.java | 12 ++++++------ 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 881eed74..6a03feb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,10 +3,10 @@ org.gradle.daemon=false # Fabric Properties # check these on https://fabricmc.net/develop - minecraft_version=1.19 - yarn_mappings=1.19+build.1 - loader_version=0.14.7 - fabric_version=0.55.3+1.19 + minecraft_version=1.19.2 + yarn_mappings=1.19.2+build.3 + loader_version=0.14.9 + fabric_version=0.59.0+1.19.2 # Mod Properties group=com.minelittlepony @@ -15,6 +15,6 @@ org.gradle.daemon=false description=Magical Abilities for Mine Little Pony! # Dependencies - modmenu_version=4.0.0 - minelp_version=4.5.1 + modmenu_version=4.0.6 + minelp_version=4.6.1 kirin_version=1.11.0 diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java index 8521df6b..9cdcd899 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java @@ -102,7 +102,7 @@ public class ButterflyEntity extends AmbientEntity { } @Override - public boolean collides() { + public boolean isCollidable() { return true; } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java index 6530f38a..f0fec37d 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java @@ -180,7 +180,7 @@ public class FloatingArtefactEntity extends Entity { } @Override - public boolean collides() { + public boolean isCollidable() { return true; } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java index 3776b6bd..5e0ed64e 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java @@ -51,7 +51,7 @@ public class SunBlindnessStatusEffect extends StatusEffect { public static boolean hasSunExposure(LivingEntity entity) { - if (entity.hasNetherPortalCooldown()) { + if (entity.hasPortalCooldown()) { return false; } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java index c5e206b2..c553dc7d 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java @@ -59,7 +59,7 @@ public class PlayerCharmTracker implements Tickable, NbtSerialisable { } public TypedActionResult> getSpellInHand(Hand hand) { - return Streams.stream(pony.getMaster().getItemsHand()) + return Streams.stream(pony.getMaster().getHandItems()) .filter(GemstoneItem::isEnchanted) .map(stack -> GemstoneItem.consumeSpell(stack, pony.getMaster(), null)) .findFirst() diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/dummy/DummyClientPlayerEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/player/dummy/DummyClientPlayerEntity.java index 0c1eb9f8..582bf617 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/dummy/DummyClientPlayerEntity.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/dummy/DummyClientPlayerEntity.java @@ -49,7 +49,7 @@ public class DummyClientPlayerEntity extends AbstractClientPlayerEntity implemen playerInfo = connection.getPlayerListEntry(getGameProfile().getId()); if (playerInfo == null) { - playerInfo = new PlayerListEntry(new Packet().entry(), MinecraftClient.getInstance().getServicesSignatureVerifier()); + playerInfo = new PlayerListEntry(new Packet().entry(), MinecraftClient.getInstance().getServicesSignatureVerifier(), false); } } diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index a4896fac..cc84fb52 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -37,10 +37,10 @@ public interface UItems { Item ROTTEN_APPLE = register("rotten_apple", new RottenAppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE))); Item COOKED_ZAP_APPLE = register("cooked_zap_apple", new Item(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE))); - Item MUSIC_DISC_CRUSADE = register("music_disc_crusade", USounds.RECORD_CRUSADE); - Item MUSIC_DISC_PET = register("music_disc_pet", USounds.RECORD_PET); - Item MUSIC_DISC_POPULAR = register("music_disc_popular", USounds.RECORD_POPULAR); - Item MUSIC_DISC_FUNK = register("music_disc_funk", USounds.RECORD_FUNK); + Item MUSIC_DISC_CRUSADE = register("music_disc_crusade", USounds.RECORD_CRUSADE, 181); + Item MUSIC_DISC_PET = register("music_disc_pet", USounds.RECORD_PET, 221); + Item MUSIC_DISC_POPULAR = register("music_disc_popular", USounds.RECORD_POPULAR, 112); + Item MUSIC_DISC_FUNK = register("music_disc_funk", USounds.RECORD_FUNK, 91); FriendshipBraceletItem FRIENDSHIP_BRACELET = register("friendship_bracelet", new FriendshipBraceletItem( new FabricItemSettings() @@ -106,11 +106,11 @@ public interface UItems { return Registry.register(Registry.ITEM, new Identifier("unicopia", name), item); } - static MusicDiscItem register(String name, SoundEvent sound) { + static MusicDiscItem register(String name, SoundEvent sound, int seconds) { return register(name, new MusicDiscItem(1, sound, new Settings() .maxCount(1) .group(ItemGroup.MISC) - .rarity(Rarity.RARE) + .rarity(Rarity.RARE), seconds ) {}); }