PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-23 21:38:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

1.19 -> 1.19.2

Browse source
This commit is contained in:
Sollace 2022-08-27 12:33:53 +02:00
parent c10b9e8e3a
commit 4699788472
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gradle.properties
View file

@ -3,10 +3,10 @@ org.gradle.daemon=false
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.19 minecraft_version=1.19.2
yarn_mappings=1.19+build.1 yarn_mappings=1.19.2+build.3
loader_version=0.14.7 loader_version=0.14.9
fabric_version=0.55.3+1.19 fabric_version=0.59.0+1.19.2
# Mod Properties # Mod Properties
group=com.minelittlepony group=com.minelittlepony
@ -15,6 +15,6 @@ org.gradle.daemon=false
description=Magical Abilities for Mine Little Pony! description=Magical Abilities for Mine Little Pony!
# Dependencies # Dependencies
modmenu_version=4.0.0 modmenu_version=4.0.6
minelp_version=4.5.1 minelp_version=4.6.1
kirin_version=1.11.0 kirin_version=1.11.0

2
src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java
View file

@ -102,7 +102,7 @@ public class ButterflyEntity extends AmbientEntity {
} }
@Override @Override
public boolean collides() { public boolean isCollidable() {
return true; return true;
} }

2
src/main/java/com/minelittlepony/unicopia/entity/FloatingArtefactEntity.java
View file

@ -180,7 +180,7 @@ public class FloatingArtefactEntity extends Entity {
} }
@Override @Override
public boolean collides() { public boolean isCollidable() {
return true; return true;
} }

2
src/main/java/com/minelittlepony/unicopia/entity/effect/SunBlindnessStatusEffect.java
View file

@ -51,7 +51,7 @@ public class SunBlindnessStatusEffect extends StatusEffect {
public static boolean hasSunExposure(LivingEntity entity) { public static boolean hasSunExposure(LivingEntity entity) {
if (entity.hasNetherPortalCooldown()) { if (entity.hasPortalCooldown()) {
return false; return false;
} }

2
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCharmTracker.java
View file

@ -59,7 +59,7 @@ public class PlayerCharmTracker implements Tickable, NbtSerialisable {
} }
public TypedActionResult<CustomisedSpellType<?>> getSpellInHand(Hand hand) { public TypedActionResult<CustomisedSpellType<?>> getSpellInHand(Hand hand) {
return Streams.stream(pony.getMaster().getItemsHand()) return Streams.stream(pony.getMaster().getHandItems())
.filter(GemstoneItem::isEnchanted) .filter(GemstoneItem::isEnchanted)
.map(stack -> GemstoneItem.consumeSpell(stack, pony.getMaster(), null)) .map(stack -> GemstoneItem.consumeSpell(stack, pony.getMaster(), null))
.findFirst() .findFirst()

2
src/main/java/com/minelittlepony/unicopia/entity/player/dummy/DummyClientPlayerEntity.java
View file

@ -49,7 +49,7 @@ public class DummyClientPlayerEntity extends AbstractClientPlayerEntity implemen
playerInfo = connection.getPlayerListEntry(getGameProfile().getId()); playerInfo = connection.getPlayerListEntry(getGameProfile().getId());
if (playerInfo == null) { if (playerInfo == null) {
playerInfo = new PlayerListEntry(new Packet().entry(), MinecraftClient.getInstance().getServicesSignatureVerifier()); playerInfo = new PlayerListEntry(new Packet().entry(), MinecraftClient.getInstance().getServicesSignatureVerifier(), false);
} }
} }

12
src/main/java/com/minelittlepony/unicopia/item/UItems.java
View file

@ -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 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 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_CRUSADE = register("music_disc_crusade", USounds.RECORD_CRUSADE, 181);
Item MUSIC_DISC_PET = register("music_disc_pet", USounds.RECORD_PET); Item MUSIC_DISC_PET = register("music_disc_pet", USounds.RECORD_PET, 221);
Item MUSIC_DISC_POPULAR = register("music_disc_popular", USounds.RECORD_POPULAR); Item MUSIC_DISC_POPULAR = register("music_disc_popular", USounds.RECORD_POPULAR, 112);
Item MUSIC_DISC_FUNK = register("music_disc_funk", USounds.RECORD_FUNK); Item MUSIC_DISC_FUNK = register("music_disc_funk", USounds.RECORD_FUNK, 91);
FriendshipBraceletItem FRIENDSHIP_BRACELET = register("friendship_bracelet", new FriendshipBraceletItem( FriendshipBraceletItem FRIENDSHIP_BRACELET = register("friendship_bracelet", new FriendshipBraceletItem(
new FabricItemSettings() new FabricItemSettings()
@ -106,11 +106,11 @@ public interface UItems {
return Registry.register(Registry.ITEM, new Identifier("unicopia", name), item); 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() return register(name, new MusicDiscItem(1, sound, new Settings()
.maxCount(1) .maxCount(1)
.group(ItemGroup.MISC) .group(ItemGroup.MISC)
.rarity(Rarity.RARE) .rarity(Rarity.RARE), seconds
) {}); ) {});
} }