From b2c04b59887a944ed2123f0155cf2f8cb8236033 Mon Sep 17 00:00:00 2001 From: brnbrd Date: Tue, 27 Aug 2024 17:37:24 -0700 Subject: [PATCH] Update Shimmering Pearl --- .../2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 | 2 +- .../4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e | 2 +- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 2 +- .../9bf8104d8e3a11f81440eb1852d0ecce8871456e | 2 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 2 +- .../b126f8ac5dcbc64ddca16855f1a05200758ac108 | 2 +- .../c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 | 2 +- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 +- .../cc4167302f34ab27f1cddc28e41e05620e830393 | 2 +- .../fbd245114a09f38b156d9da7e5324fd159bd1a13 | 2 +- .../assets/collectorsreap/lang/en_us.json | 5 +- .../collectorsreap/common/CRSoundEvents.java | 20 +++++ .../common/entity/ThrownShimmeringPearl.java | 73 +++++++++++++++---- .../common/item/ShimmeringPearlItem.java | 3 +- .../data/gen/CRLanguageProvider.java | 5 +- .../collectorsreap/proxy/CommonProxy.java | 2 + .../resources/META-INF/accesstransformer.cfg | 5 +- .../assets/collectorsreap/lang/es_es.json | 1 + .../assets/collectorsreap/lang/es_mx.json | 1 + .../assets/collectorsreap/lang/ja_jp.json | 1 + .../assets/collectorsreap/lang/ko_kr.json | 1 + .../assets/collectorsreap/lang/ru_ru.json | 1 + .../assets/collectorsreap/lang/uk_ua.json | 1 + .../assets/collectorsreap/lang/vi_vn.json | 1 + .../assets/collectorsreap/lang/zh_cn.json | 1 + .../assets/collectorsreap/sounds.json | 9 +++ 26 files changed, 120 insertions(+), 32 deletions(-) create mode 100644 src/main/java/net/brdle/collectorsreap/common/CRSoundEvents.java create mode 100644 src/main/resources/assets/collectorsreap/sounds.json diff --git a/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 b/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 index 54ec1d66..9ea3454e 100644 --- a/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 +++ b/src/generated/resources/.cache/2e975a526352ade1ad4fb90b352cd5fb8d2e73d8 @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2141137 Tags for minecraft:item mod id collectorsreap +// 1.20.1 2024-08-27T17:34:16.8440785 Tags for minecraft:item mod id collectorsreap ae7e08f92dd075f34544c04d30c8a274b27bd792 data/atmospheric/tags/items/aloe_leaves.json b1c02044b6eb4060b19a0ed4f40cbeaca19822c9 data/atmospheric/tags/items/passion_fruit.json a740abeb613a7024a35910efe912a50a6ee62045 data/atmospheric/tags/items/yucca_fruit.json diff --git a/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e b/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e index 768504fd..62082628 100644 --- a/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e +++ b/src/generated/resources/.cache/4d9bdf6f3a0c6e917590cb2a69ac26c5a7d7ed8e @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.200103 Block States: collectorsreap +// 1.20.1 2024-08-27T17:34:16.8340693 Block States: collectorsreap e674cff0fcbb19f9b0afff4f1e477315d0cae326 assets/collectorsreap/blockstates/black_candle_lime_cake.json 8dfd84c574e9c7ee59198b0943b5aac0e8b28740 assets/collectorsreap/blockstates/black_candle_pomegranate_cake.json 6d6114f63bd694ebbf674057ebd45184487bbaf1 assets/collectorsreap/blockstates/blue_candle_lime_cake.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index d50e62eb..93012a24 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2061078 Loot Tables +// 1.20.1 2024-08-27T17:34:16.8400739 Loot Tables f4a3c88fc95a893f684db7cc68e3f910e18b85fe data/collectorsreap/loot_tables/blocks/black_candle_lime_cake.json d1c4a614122d59c6e0b808daecf41bda624609db data/collectorsreap/loot_tables/blocks/black_candle_pomegranate_cake.json f88a0ece599f6eb71b969a4b3262f221540435a9 data/collectorsreap/loot_tables/blocks/blue_candle_lime_cake.json diff --git a/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e b/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e index 876f5276..b14123f1 100644 --- a/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e +++ b/src/generated/resources/.cache/9bf8104d8e3a11f81440eb1852d0ecce8871456e @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2091101 Tags for minecraft:worldgen/biome mod id collectorsreap +// 1.20.1 2024-08-27T17:34:16.8430776 Tags for minecraft:worldgen/biome mod id collectorsreap 5caa141a3a5eff8ee89b5e2092eac7253dd52f57 data/collectorsreap/tags/worldgen/biome/has_spawn/chieftain_crab.json 74a855e481dd684fc14e843ffbf7634328669190 data/collectorsreap/tags/worldgen/biome/has_spawn/clam.json 4301fee991060a44225e5c74bedfd95e386538e1 data/collectorsreap/tags/worldgen/biome/has_spawn/lime.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 003f0887..86202268 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2071088 Recipes +// 1.20.1 2024-08-27T17:34:16.8410748 Recipes 6bed5b7d715399840f10473875efca57540c42e3 data/collectorsreap/advancements/recipes/chiseled_urchin_test_bricks.json ffff41205e9b83cc8ab9d38ce39c06fa7e8f6ae7 data/collectorsreap/advancements/recipes/cutting/chieftain_claw.json 51d613fd6d246740518e1ed57afea6e6deea518e data/collectorsreap/advancements/recipes/cutting/chieftain_crab.json diff --git a/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 b/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 index 8f533424..b86d95fc 100644 --- a/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 +++ b/src/generated/resources/.cache/b126f8ac5dcbc64ddca16855f1a05200758ac108 @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2071088 Global Loot Modifiers : collectorsreap +// 1.20.1 2024-08-27T17:34:16.8400739 Global Loot Modifiers : collectorsreap 48ba606dd1af587f71212a0501539edb8b011f1e data/collectorsreap/loot_modifiers/cr_fishing.json fc90485601f70b14ac274d5d5179aa07d47b040f data/collectorsreap/loot_modifiers/lime_in_abandoned_mineshaft.json 753e8d670c790ed4fa156b208d70e62856229cf5 data/collectorsreap/loot_modifiers/lime_seeds_in_dungeon.json diff --git a/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 b/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 index a45eb9b0..59525a08 100644 --- a/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 +++ b/src/generated/resources/.cache/c5fd7cc2a72bfa43784da084dc700dcde7db9bc3 @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2031054 Tags for minecraft:block mod id collectorsreap +// 1.20.1 2024-08-27T17:34:16.837072 Tags for minecraft:block mod id collectorsreap 748e9338cb0e08e973af854da7e0a45c328db6fb data/autumnity/tags/blocks/snail_snacks.json 69bfc567eebda2cc6321f420e07d43720e9719f7 data/collectorsreap/tags/blocks/crab_spawnable_on.json 057d34c386714f69ae8324b835cfdb749a33f4c1 data/collectorsreap/tags/blocks/pomegranate_fast_on.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index bd811c2d..05e5bd3a 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.20.1 2024-08-24T18:09:18.2131126 Languages: en_us -19c58124c40bb828ca4e980dd808d029934ffa39 assets/collectorsreap/lang/en_us.json +// 1.20.1 2024-08-27T17:34:16.8430776 Languages: en_us +abf586c937156528634bcfefb6d2fb1fe6abcb79 assets/collectorsreap/lang/en_us.json diff --git a/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 b/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 index caee5c92..52d8aedb 100644 --- a/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 +++ b/src/generated/resources/.cache/cc4167302f34ab27f1cddc28e41e05620e830393 @@ -1,3 +1,3 @@ -// 1.20.1 2024-08-24T18:09:18.2041063 Tags for minecraft:entity_type mod id collectorsreap +// 1.20.1 2024-08-27T17:34:16.8380722 Tags for minecraft:entity_type mod id collectorsreap ddd907b6cb1b03c93f42247088b1f1fa5a81084f data/collectorsreap/tags/entity_types/involatile.json 01c3f5cebabec10bf259b13ce1d6ce40be8bda20 data/collectorsreap/tags/entity_types/volatility_immune.json diff --git a/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 b/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 index f166de27..7c18fab3 100644 --- a/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 +++ b/src/generated/resources/.cache/fbd245114a09f38b156d9da7e5324fd159bd1a13 @@ -1,4 +1,4 @@ -// 1.20.1 2024-08-24T18:09:18.2051071 Item Models: collectorsreap +// 1.20.1 2024-08-27T17:34:16.8390731 Item Models: collectorsreap b183daae948efe76cbf209119af41701e5b72e95 assets/collectorsreap/models/item/adzuki_gummy.json 56db9a7317e6d5a63c63af71a4011b16c66c00e7 assets/collectorsreap/models/item/aloe_gummy.json b27cb012c75da3137768f12a8074eab65874647a assets/collectorsreap/models/item/apple_gummy.json diff --git a/src/generated/resources/assets/collectorsreap/lang/en_us.json b/src/generated/resources/assets/collectorsreap/lang/en_us.json index dbcd9783..b2c33c6b 100644 --- a/src/generated/resources/assets/collectorsreap/lang/en_us.json +++ b/src/generated/resources/assets/collectorsreap/lang/en_us.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Urchin Test Tiles", "block.collectorsreap.white_candle_lime_cake": "Lime Cake with White Candle", "block.collectorsreap.white_candle_pomegranate_cake": "Pomegranate Cake with White Candle", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Limes can be found as a wild bush in flower forests.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", @@ -66,10 +67,10 @@ "entity.collectorsreap.chieftain_crab": "Chieftain Crab", "entity.collectorsreap.clam": "Tide Clam", "entity.collectorsreap.platinum_bass": "Platinum Bass", - "entity.collectorsreap.shimmering_pearl": "Shimmering Pearl", + "entity.collectorsreap.shimmering_pearl": "Thrown Shimmering Pearl", "entity.collectorsreap.tiger_prawn": "Tiger Prawn", "entity.collectorsreap.urchin": "Urchin", - "entity.collectorsreap.urchin_dart": "Urchin Dart", + "entity.collectorsreap.urchin_dart": "Thrown Urchin Dart", "fluid_type.collectorsreap.lime_green_tea_type": "Lime Green Tea", "fluid_type.collectorsreap.pomegranate_black_tea_type": "Pomegranate Black Tea", "item.collectorsreap.adzuki_gummy": "Adzuki Gummy", diff --git a/src/main/java/net/brdle/collectorsreap/common/CRSoundEvents.java b/src/main/java/net/brdle/collectorsreap/common/CRSoundEvents.java new file mode 100644 index 00000000..c7580469 --- /dev/null +++ b/src/main/java/net/brdle/collectorsreap/common/CRSoundEvents.java @@ -0,0 +1,20 @@ +package net.brdle.collectorsreap.common; + +import net.brdle.collectorsreap.CollectorsReap; +import net.brdle.collectorsreap.Util; +import net.minecraft.sounds.SoundEvent; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class CRSoundEvents { + public static final DeferredRegister SOUNDS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, CollectorsReap.MODID); + + public static final RegistryObject SHIMMERING_PEARL_THROW = SOUNDS.register("shimmering_pearl_throw", + () -> SoundEvent.createVariableRangeEvent(Util.cr("entity.shimmering_pearl.throw"))); + + public static void create(IEventBus bus) { + SOUNDS.register(bus); + } +} diff --git a/src/main/java/net/brdle/collectorsreap/common/entity/ThrownShimmeringPearl.java b/src/main/java/net/brdle/collectorsreap/common/entity/ThrownShimmeringPearl.java index e86f9c14..54779bb4 100644 --- a/src/main/java/net/brdle/collectorsreap/common/entity/ThrownShimmeringPearl.java +++ b/src/main/java/net/brdle/collectorsreap/common/entity/ThrownShimmeringPearl.java @@ -4,18 +4,24 @@ import net.minecraft.core.particles.ParticleTypes; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.effect.MobEffectInstance; +import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.entity.projectile.ThrowableItemProjectile; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; +import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.util.ITeleporter; -import org.jetbrains.annotations.NotNull; +import net.minecraftforge.event.ForgeEventFactory; import javax.annotation.Nullable; +import org.jetbrains.annotations.NotNull; public class ThrownShimmeringPearl extends ThrowableItemProjectile { public ThrownShimmeringPearl(EntityType type, Level level) { @@ -38,6 +44,17 @@ public void onHitEntity(@NotNull EntityHitResult result) { this.discard(); } + private void teleport(Entity entity, double X, double Y, double Z) { + entity.teleportTo(X, Y, Z); + entity.resetFallDistance(); + if (entity instanceof LivingEntity living) { + living.addEffect(new MobEffectInstance(MobEffects.SLOW_FALLING, 100, 2)); + if (entity.isInWater()) { + living.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 60, 0)); + } + } + } + @Override public void onHit(@NotNull HitResult result) { super.onHit(result); @@ -45,20 +62,16 @@ public void onHit(@NotNull HitResult result) { this.level().addParticle(ParticleTypes.BUBBLE_POP, this.getX(), this.getY() + this.random.nextDouble() * 2.0, this.getZ(), this.random.nextGaussian(), 0.0, this.random.nextGaussian()); } if (!this.level().isClientSide() && !this.isRemoved()) { - if (!this.isInWater()) { - Entity entity = this.getOwner(); - if (entity instanceof ServerPlayer server) { - if (server.connection.isAcceptingMessages() && server.level() == this.level() && !server.isSleeping()) { - if (server.isPassenger()) { - server.dismountTo(this.getX(), this.getY(), this.getZ()); - } - entity.teleportTo(this.getX(), this.getY(), this.getZ()); - entity.resetFallDistance(); + Entity entity = this.getOwner(); + if (entity instanceof ServerPlayer server) { + if (server.connection.isAcceptingMessages() && server.level() == this.level() && !server.isSleeping()) { + if (server.isPassenger()) { + server.dismountTo(this.getX(), this.getY(), this.getZ()); } - } else if (entity != null) { - entity.teleportTo(this.getX(), this.getY(), this.getZ()); - entity.resetFallDistance(); + this.teleport(entity, this.getX(), this.getY(), this.getZ()); } + } else if (entity != null) { + this.teleport(entity, this.getX(), this.getY(), this.getZ()); } this.discard(); } @@ -70,7 +83,37 @@ public void tick() { if (entity instanceof Player && !entity.isAlive()) { this.discard(); } else { - super.tick(); + // Projectile + if (!this.hasBeenShot) { + this.gameEvent(GameEvent.PROJECTILE_SHOOT, this.getOwner()); + this.hasBeenShot = true; + } + if (!this.leftOwner) { + this.leftOwner = this.checkLeftOwner(); + } + + // Entity + this.baseTick(); + + // ThrowableProjectile + HitResult hitresult = ProjectileUtil.getHitResultOnMoveVector(this, this::canHitEntity); + if (hitresult.getType() != HitResult.Type.MISS && !ForgeEventFactory.onProjectileImpact(this, hitresult)) { + this.onHit(hitresult); + } + this.checkInsideBlocks(); + Vec3 vec3 = this.getDeltaMovement(); + double d2 = this.getX() + vec3.x; + double d0 = this.getY() + vec3.y; + double d1 = this.getZ() + vec3.z; + this.updateRotation(); + if (this.isInWater()) { + this.level().addParticle(ParticleTypes.BUBBLE, d2 - vec3.x * 0.25, d0 - vec3.y * 0.25, d1 - vec3.z * 0.25, vec3.x, vec3.y, vec3.z); + } + if (!this.isNoGravity()) { + Vec3 vec31 = this.getDeltaMovement(); + this.setDeltaMovement(vec31.x, vec31.y - (double)this.getGravity(), vec31.z); + } + this.setPos(d2, d0, d1); } } @@ -90,6 +133,6 @@ public boolean fireImmune() { @Override public boolean dismountsUnderwater() { - return true; + return false; } } \ No newline at end of file diff --git a/src/main/java/net/brdle/collectorsreap/common/item/ShimmeringPearlItem.java b/src/main/java/net/brdle/collectorsreap/common/item/ShimmeringPearlItem.java index dfadda7c..2ec790eb 100644 --- a/src/main/java/net/brdle/collectorsreap/common/item/ShimmeringPearlItem.java +++ b/src/main/java/net/brdle/collectorsreap/common/item/ShimmeringPearlItem.java @@ -1,5 +1,6 @@ package net.brdle.collectorsreap.common.item; +import net.brdle.collectorsreap.common.CRSoundEvents; import net.brdle.collectorsreap.common.entity.ThrownShimmeringPearl; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -26,7 +27,7 @@ public ShimmeringPearlItem(Properties properties) { @Override public @NotNull InteractionResultHolder use(Level level, Player player, @NotNull InteractionHand hand) { ItemStack itemstack = player.getItemInHand(hand); - level.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENDER_PEARL_THROW, SoundSource.NEUTRAL, 0.5F, 0.4F / (level.getRandom().nextFloat() * 0.4F + 0.8F)); + level.playSound(null, player.getX(), player.getY(), player.getZ(), CRSoundEvents.SHIMMERING_PEARL_THROW.get(), SoundSource.NEUTRAL, 0.5F, 0.4F / (level.getRandom().nextFloat() * 0.4F + 0.8F)); player.getCooldowns().addCooldown(this, 15); if (!level.isClientSide()) { ThrownShimmeringPearl thrown = new ThrownShimmeringPearl(level, player); diff --git a/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java b/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java index ffbcead6..4eb5cdec 100644 --- a/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java +++ b/src/main/java/net/brdle/collectorsreap/data/gen/CRLanguageProvider.java @@ -29,8 +29,8 @@ private void addEntities() { addEntityType(CREntities.CHIEFTAIN_CRAB, "Chieftain Crab"); addEntityType(CREntities.CLAM, "Tide Clam"); addEntityType(CREntities.URCHIN, "Urchin"); - addEntityType(CREntities.URCHIN_DART, "Urchin Dart"); - addEntityType(CREntities.SHIMMERING_PEARL, "Shimmering Pearl"); + addEntityType(CREntities.URCHIN_DART, "Thrown Urchin Dart"); + addEntityType(CREntities.SHIMMERING_PEARL, "Thrown Shimmering Pearl"); } private void addText() { @@ -43,6 +43,7 @@ private void addText() { add("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.POMEGRANATE), "Pomegranates can be found as a wild bush in warped forests."); add("desc." + CollectorsReap.MODID + "." + Util.name(CRItems.POMEGRANATE) + ".pollination", "A flowering Pomegranate Bush will grow fruit in the Overworld when pollinated by a Bee."); add("config.jade.plugin_" + CollectorsReap.MODID + ".crop_progress", "Crop Progress"); + add(CollectorsReap.MODID + ".subtitle.shimmering_pearl.throw", "Shimmering Pearl flies"); } private void addEffects() { diff --git a/src/main/java/net/brdle/collectorsreap/proxy/CommonProxy.java b/src/main/java/net/brdle/collectorsreap/proxy/CommonProxy.java index 8aac420d..aa3872a4 100644 --- a/src/main/java/net/brdle/collectorsreap/proxy/CommonProxy.java +++ b/src/main/java/net/brdle/collectorsreap/proxy/CommonProxy.java @@ -1,6 +1,7 @@ package net.brdle.collectorsreap.proxy; import net.brdle.collectorsreap.common.CRParticleTypes; +import net.brdle.collectorsreap.common.CRSoundEvents; import net.brdle.collectorsreap.common.ForgeEvents; import net.brdle.collectorsreap.common.ModEvents; import net.brdle.collectorsreap.common.block.CRBlocks; @@ -32,5 +33,6 @@ public void start() { CRFeatures.create(modBus); CRLootItemConditions.create(modBus); CRLootModifiers.create(modBus); + CRSoundEvents.create(modBus); } } \ No newline at end of file diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index cfd1ee32..4dbfa6ee 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,4 +1,7 @@ public net.minecraft.world.entity.projectile.ThrownTrident f_37555_ #tridentItem public net.minecraft.world.entity.animal.Bee m_27869_()I # getCropsGrownSincePollination public net.minecraft.world.entity.animal.Bee m_27871_()V # incrementNumCropsGrownSincePollination -public net.minecraft.world.level.storage.loot.entries.LootTableReference f_79754_ # name \ No newline at end of file +public net.minecraft.world.level.storage.loot.entries.LootTableReference f_79754_ # name +public net.minecraft.world.entity.projectile.Projectile f_150164_ # hasBeenShot +public net.minecraft.world.entity.projectile.Projectile f_37246_ # leftOwner +public net.minecraft.world.entity.projectile.Projectile m_37276_()Z # checkLeftOwner \ No newline at end of file diff --git a/src/main/resources/assets/collectorsreap/lang/es_es.json b/src/main/resources/assets/collectorsreap/lang/es_es.json index 48ca55e2..e01b7401 100644 --- a/src/main/resources/assets/collectorsreap/lang/es_es.json +++ b/src/main/resources/assets/collectorsreap/lang/es_es.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Baldosas de testa de erizo", "block.collectorsreap.white_candle_lime_cake": "Tarta de lima con vela blanca", "block.collectorsreap.white_candle_pomegranate_cake": "Tarta de granada con vela blanca", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Se encuentra en bosques floridos.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/es_mx.json b/src/main/resources/assets/collectorsreap/lang/es_mx.json index cb9fddf8..3efae68d 100644 --- a/src/main/resources/assets/collectorsreap/lang/es_mx.json +++ b/src/main/resources/assets/collectorsreap/lang/es_mx.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Baldosas de testa de erizo", "block.collectorsreap.white_candle_lime_cake": "Pastel de lima con vela blanca", "block.collectorsreap.white_candle_pomegranate_cake": "Pastel de granada con vela blanca", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Se encuentra en bosques floridos.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/ja_jp.json b/src/main/resources/assets/collectorsreap/lang/ja_jp.json index 2a5d3905..d276dea6 100644 --- a/src/main/resources/assets/collectorsreap/lang/ja_jp.json +++ b/src/main/resources/assets/collectorsreap/lang/ja_jp.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Urchin Test Tiles", "block.collectorsreap.white_candle_lime_cake": "Lime Cake with White Candle", "block.collectorsreap.white_candle_pomegranate_cake": "Pomegranate Cake with White Candle", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Found in Flower Forests.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/ko_kr.json b/src/main/resources/assets/collectorsreap/lang/ko_kr.json index ca872fc7..0b3275df 100644 --- a/src/main/resources/assets/collectorsreap/lang/ko_kr.json +++ b/src/main/resources/assets/collectorsreap/lang/ko_kr.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Urchin Test Tiles", "block.collectorsreap.white_candle_lime_cake": "Lime Cake with White Candle", "block.collectorsreap.white_candle_pomegranate_cake": "Pomegranate Cake with White Candle", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "꽃 숲에서 발견할 수 있습니다.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/ru_ru.json b/src/main/resources/assets/collectorsreap/lang/ru_ru.json index 8a3b8c57..e45d0745 100644 --- a/src/main/resources/assets/collectorsreap/lang/ru_ru.json +++ b/src/main/resources/assets/collectorsreap/lang/ru_ru.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Urchin Test Tiles", "block.collectorsreap.white_candle_lime_cake": "Лаймовый торт с белой свечой", "block.collectorsreap.white_candle_pomegranate_cake": "Гранатовый торт с белой свечой", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Можно найти в цветочном лесу.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/uk_ua.json b/src/main/resources/assets/collectorsreap/lang/uk_ua.json index 49b72416..a51649e5 100644 --- a/src/main/resources/assets/collectorsreap/lang/uk_ua.json +++ b/src/main/resources/assets/collectorsreap/lang/uk_ua.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Urchin Test Tiles", "block.collectorsreap.white_candle_lime_cake": "Лаймовий торт з білою свічкою", "block.collectorsreap.white_candle_pomegranate_cake": "Гранатовий торт з білою свічкою", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Можна знайти в Квітучих лісах.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/vi_vn.json b/src/main/resources/assets/collectorsreap/lang/vi_vn.json index bbb722bf..757c3b2f 100644 --- a/src/main/resources/assets/collectorsreap/lang/vi_vn.json +++ b/src/main/resources/assets/collectorsreap/lang/vi_vn.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "Urchin Test Tiles", "block.collectorsreap.white_candle_lime_cake": "Bánh Chanh Nến Trắng", "block.collectorsreap.white_candle_pomegranate_cake": "Bánh Lựu Nến Trắng", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "Crop Progress", "desc.collectorsreap.lime": "Tìm Trong Rừng hoa.", "desc.collectorsreap.lime.pollination": "A flowering Lime Bush will grow fruit when pollinated by a Bee.", diff --git a/src/main/resources/assets/collectorsreap/lang/zh_cn.json b/src/main/resources/assets/collectorsreap/lang/zh_cn.json index 2fa03d1e..c5435d0b 100644 --- a/src/main/resources/assets/collectorsreap/lang/zh_cn.json +++ b/src/main/resources/assets/collectorsreap/lang/zh_cn.json @@ -53,6 +53,7 @@ "block.collectorsreap.urchin_test_tiles": "海胆壳瓦", "block.collectorsreap.white_candle_lime_cake": "插上白色蜡烛的青柠蛋糕", "block.collectorsreap.white_candle_pomegranate_cake": "插上白色蜡烛的石榴蛋糕", + "collectorsreap.subtitle.shimmering_pearl.throw": "Shimmering Pearl flies", "config.jade.plugin_collectorsreap.crop_progress": "作物生长状态", "desc.collectorsreap.lime": "可在繁花森林中找到。", "desc.collectorsreap.lime.pollination": "开花的青柠树丛在蜜蜂授粉后会长出果实。", diff --git a/src/main/resources/assets/collectorsreap/sounds.json b/src/main/resources/assets/collectorsreap/sounds.json new file mode 100644 index 00000000..ac800452 --- /dev/null +++ b/src/main/resources/assets/collectorsreap/sounds.json @@ -0,0 +1,9 @@ +{ + "entity.shimmering_pearl.throw": { + "subtitle": "collectorsreap.subtitle.shimmering_pearl.throw", + "sounds": [ + "minecraft:entity/endereye/endereye_launch1", + "minecraft:entity/endereye/endereye_launch2" + ] + } +} \ No newline at end of file