From e9e238dd3d2880bc5de3c669f6a5473937d7cfce Mon Sep 17 00:00:00 2001 From: Sollace Date: Wed, 25 Aug 2021 14:22:11 +0200 Subject: [PATCH] Remove the old WorldEvent util. This is no longer needed in 1.17 --- .../ability/EarthPonyKickAbility.java | 4 +- .../ability/EarthPonyStompAbility.java | 6 +- .../ability/magic/spell/NecromancySpell.java | 4 +- .../unicopia/entity/UTradeOffers.java | 1 + .../entity/behaviour/SheepBehaviour.java | 5 +- .../entity/behaviour/SilverfishBehaviour.java | 5 +- .../unicopia/item/FilledJarItem.java | 5 +- .../minelittlepony/unicopia/item/JarItem.java | 7 +- .../unicopia/util/WorldEvent.java | 84 ------------------- 9 files changed, 22 insertions(+), 99 deletions(-) delete mode 100644 src/main/java/com/minelittlepony/unicopia/util/WorldEvent.java diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java index 657c9708..8f444cf2 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyKickAbility.java @@ -13,7 +13,6 @@ import com.minelittlepony.unicopia.ability.data.tree.TreeType; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.util.PosHelper; import com.minelittlepony.unicopia.util.RayTraceHelper; -import com.minelittlepony.unicopia.util.WorldEvent; import com.minelittlepony.unicopia.util.shape.Shape; import com.minelittlepony.unicopia.util.shape.Sphere; @@ -31,6 +30,7 @@ import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.Vec3d; +import net.minecraft.world.WorldEvents; /** * Earth Pony kicking ability @@ -164,7 +164,7 @@ public class EarthPonyKickAbility implements Ability { if (world.getBlockState(position.down()).isAir()) { ItemStack stack = tree.pickRandomStack(state); if (!stack.isEmpty()) { - WorldEvent.play(WorldEvent.DESTROY_BLOCK, world, position, state); + world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, position, Block.getRawIdFromState(state)); capturedDrops.add(new ItemEntity(world, position.getX() + world.random.nextFloat(), diff --git a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java index 63ea1231..c380aff8 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/EarthPonyStompAbility.java @@ -11,7 +11,8 @@ import com.minelittlepony.unicopia.particle.ParticleUtils; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.util.MagicalDamageSource; import com.minelittlepony.unicopia.util.PosHelper; -import com.minelittlepony.unicopia.util.WorldEvent; + +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.LivingEntity; @@ -22,6 +23,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraft.world.WorldEvents; /** * Earth Pony stomping ability @@ -162,7 +164,7 @@ public class EarthPonyStompAbility implements Ability { if (destr.damageBlock(pos, damage) >= BlockDestructionManager.MAX_DAMAGE) { w.breakBlock(pos, true); } else { - WorldEvent.play(WorldEvent.DESTROY_BLOCK, w, pos, state); + w.syncWorldEvent(WorldEvents.BLOCK_BROKEN, pos, Block.getRawIdFromState(state)); } } } diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/NecromancySpell.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/NecromancySpell.java index 8348ca34..e5a74b99 100644 --- a/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/NecromancySpell.java +++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/spell/NecromancySpell.java @@ -6,7 +6,6 @@ import java.util.List; import com.minelittlepony.unicopia.ability.magic.Caster; import com.minelittlepony.unicopia.entity.EntityReference; import com.minelittlepony.unicopia.util.Weighted; -import com.minelittlepony.unicopia.util.WorldEvent; import com.minelittlepony.unicopia.util.shape.Shape; import com.minelittlepony.unicopia.util.shape.Sphere; @@ -19,6 +18,7 @@ import net.minecraft.particle.ParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.Difficulty; +import net.minecraft.world.WorldEvents; public class NecromancySpell extends AbstractPlacedSpell { @@ -106,7 +106,7 @@ public class NecromancySpell extends AbstractPlacedSpell { zombie.updatePositionAndAngles(pos.x, pos.y, pos.z, 0, 0); zombie.setVelocity(0, 0.3, 0); - source.getWorld().syncWorldEvent(WorldEvent.ZOMBIE_BREAK_WOODEN_DOOR, zombie.getBlockPos(), 0); + source.getWorld().syncWorldEvent(WorldEvents.ZOMBIE_BREAKS_WOODEN_DOOR, zombie.getBlockPos(), 0); source.getWorld().spawnEntity(zombie); diff --git a/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java b/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java index 11493dc2..ad3bf08a 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/UTradeOffers.java @@ -68,6 +68,7 @@ public interface UTradeOffers { return (e, rng) -> new TradeOffer(new ItemStack(item.getRandom(rng), count), new ItemStack(returnItem, returnCount), maxUses, experience, priceChange); } + @SuppressWarnings("unused") private static TradeOffers.Factory buy(Tag item, int count, Tag returnItem, int returnCount, int maxUses, int experience, float priceChange) { return (e, rng) -> new TradeOffer(new ItemStack(item.getRandom(rng), count), new ItemStack(returnItem.getRandom(rng), returnCount), maxUses, experience, priceChange); } diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SheepBehaviour.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SheepBehaviour.java index ab7121d1..b402fb21 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SheepBehaviour.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SheepBehaviour.java @@ -5,8 +5,8 @@ import java.util.Random; import com.minelittlepony.unicopia.ability.magic.spell.DisguiseSpell; import com.minelittlepony.unicopia.entity.player.Pony; import com.minelittlepony.unicopia.mixin.MixinSheepEntity; -import com.minelittlepony.unicopia.util.WorldEvent; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.ItemEntity; @@ -15,6 +15,7 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldEvents; public class SheepBehaviour extends EntityBehaviour { @Override @@ -32,7 +33,7 @@ public class SheepBehaviour extends EntityBehaviour { } } else { if (entity.isSheared() && grass) { - WorldEvent.play(WorldEvent.DESTROY_BLOCK, entity.world, pos, state); + entity.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, pos, Block.getRawIdFromState(state)); entity.world.setBlockState(pos, Blocks.DIRT.getDefaultState(), 2); entity.onEatingGrass(); diff --git a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SilverfishBehaviour.java b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SilverfishBehaviour.java index 924f7e11..0d5fe705 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SilverfishBehaviour.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/behaviour/SilverfishBehaviour.java @@ -3,11 +3,12 @@ package com.minelittlepony.unicopia.entity.behaviour; import com.minelittlepony.unicopia.ability.magic.spell.DisguiseSpell; import com.minelittlepony.unicopia.block.state.StateMaps; import com.minelittlepony.unicopia.entity.player.Pony; -import com.minelittlepony.unicopia.util.WorldEvent; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.mob.SilverfishEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.WorldEvents; public class SilverfishBehaviour extends EntityBehaviour { @Override @@ -17,7 +18,7 @@ public class SilverfishBehaviour extends EntityBehaviour { BlockState state = entity.world.getBlockState(pos); if (StateMaps.SILVERFISH_AFFECTED.convert(entity.world, pos)) { - WorldEvent.play(WorldEvent.DESTROY_BLOCK, entity.world, pos, state); + entity.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, pos, Block.getRawIdFromState(state)); } } } diff --git a/src/main/java/com/minelittlepony/unicopia/item/FilledJarItem.java b/src/main/java/com/minelittlepony/unicopia/item/FilledJarItem.java index ab40c461..0cf3ecec 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/FilledJarItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/FilledJarItem.java @@ -2,8 +2,8 @@ package com.minelittlepony.unicopia.item; import com.minelittlepony.unicopia.entity.IItemEntity; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; -import com.minelittlepony.unicopia.util.WorldEvent; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.attribute.EntityAttributeInstance; @@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.ActionResult; +import net.minecraft.world.WorldEvents; public class FilledJarItem extends JarItem implements ChameleonItem { @@ -52,7 +53,7 @@ public class FilledJarItem extends JarItem implements ChameleonItem { ItemStack stack = getAppearanceStack(projectile.getStack()); stack.damage(1, projectile.world.random, null); projectile.dropStack(stack); - WorldEvent.play(WorldEvent.DESTROY_BLOCK, projectile.world, projectile.getBlockPos(), Blocks.GLASS.getDefaultState()); + projectile.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, projectile.getBlockPos(), Block.getRawIdFromState(Blocks.GLASS.getDefaultState())); } public ItemStack withContents(ItemStack contents) { diff --git a/src/main/java/com/minelittlepony/unicopia/item/JarItem.java b/src/main/java/com/minelittlepony/unicopia/item/JarItem.java index 60133a53..3227dd8c 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/JarItem.java +++ b/src/main/java/com/minelittlepony/unicopia/item/JarItem.java @@ -5,8 +5,8 @@ import com.minelittlepony.unicopia.entity.ItemImpl; import com.minelittlepony.unicopia.particle.UParticles; import com.minelittlepony.unicopia.projectile.MagicProjectileEntity; import com.minelittlepony.unicopia.projectile.ProjectileDelegate; -import com.minelittlepony.unicopia.util.WorldEvent; +import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; @@ -26,6 +26,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.WorldEvents; import net.minecraft.world.level.ServerWorldProperties; public class JarItem extends Item implements ProjectileDelegate, ItemImpl.TickableItem { @@ -139,7 +140,7 @@ public class JarItem extends Item implements ProjectileDelegate, ItemImpl.Tickab } if (rain || thunder) { - projectile.world.syncWorldEvent(WorldEvent.PROJECTILE_HIT, projectile.getBlockPos(), thunder ? 0x888888 : 0xF8F8F8); + projectile.world.syncWorldEvent(WorldEvents.SPLASH_POTION_SPLASHED, projectile.getBlockPos(), thunder ? 0x888888 : 0xF8F8F8); for (int i = projectile.world.random.nextInt(3) + 1; i >= 0; i--) { projectile.world.addParticle(UParticles.CLOUDS_ESCAPING, true, @@ -151,6 +152,6 @@ public class JarItem extends Item implements ProjectileDelegate, ItemImpl.Tickab } } - WorldEvent.play(WorldEvent.DESTROY_BLOCK, projectile.world, projectile.getBlockPos(), Blocks.GLASS.getDefaultState()); + projectile.world.syncWorldEvent(WorldEvents.BLOCK_BROKEN, projectile.getBlockPos(), Block.getRawIdFromState(Blocks.GLASS.getDefaultState())); } } diff --git a/src/main/java/com/minelittlepony/unicopia/util/WorldEvent.java b/src/main/java/com/minelittlepony/unicopia/util/WorldEvent.java deleted file mode 100644 index 04748be6..00000000 --- a/src/main/java/com/minelittlepony/unicopia/util/WorldEvent.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.minelittlepony.unicopia.util; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.WorldAccess; - -/** - * All of the Auxiliary effects used in minecraft for World.playGlobalEvent - */ -public interface WorldEvent { - int - DISPENSER_SUCCESS = 1000, - DISPENSER_FAIL = 1001, - DISPENSER_LAUNCH = 1002, - ENDER_EYE_LAUNCH = 1003, - FIREWORKS_ROCKET_SHOOT = 1004, - IRON_DOOR_OPEN = 1005, - WOODEN_DOOR_OPEN = 1006, - WOODEN_TRAPDOOR_OPEN = 1007, - FENCE_GATE_OPEN = 1008, - FIRE_EXTINGUISH = 1009, - MUSIC_DISC_PLAY = 1010, - IRON_DOOR_CLOSE = 1011, - WOODEN_DOOR_CLOSE = 1012, - WOODEN_TRAPDOOR_CLOSE = 1013, - FENCE_GATE_CLOSE = 1014, - GHAST_WARN = 1015, - GHAST_SHOOT = 1016, - ENDER_DRAGON_SHOOT = 1017, - BLAZE_SHOOT = 1018, - ZOMBIE_ATTACK_WOODEN_DOOR = 1019, - ZOMBIE_ATTACK_IRON_DOOR = 1020, - ZOMBIE_BREAK_WOODEN_DOOR = 1021, - WITHER_BREAK_BLOCK = 1022, - WITHER_SHOOT = 1024, - BAT_TAKEOFF = 1025, - ZOMBIE_INFECT = 1026, - ZOMBIE_VILLAGER_CONVERTED = 1027, - ANVIL_DESTROY = 1029, - ANVIL_USE = 1030, - ANVIL_LAND = 1031, - PORTAL_TRAVEL = 1032, - CHORUS_FLOWER_GROW = 1033, - CHORUS_FLOWER_DEATH = 1034, - BREWING_STAND_BREW = 1035, - IRON_TRAPDOOR_CLOSE = 1036, - IRON_TRAPDOOR_OPEN = 1037, - - PHANTOM_BITE = 1039, - ZOMBIE_CONVERTED_TO_DROWNED = 1040, - HUSK_CONVERTED_TO_ZOMBIE = 1041, - GRINDSTONE_USE = 1042, - BOOK_PAGE_TURN = 2043, - SMITHING_TABLE_USE = 1044, - COMPOSTER_COMPOST = 1500, - LAVA_EXTINGUISH = 1501, - REDSTONE_TORCH_BURNOUT = 1502, - END_PORTAL_FRAME_FILL = 1503, - - DISPENSER_PARTICLES = 2000, - DESTROY_BLOCK = 2001, - XP_POP = 2002, PROJECTILE_HIT = 2002, - EYE_OF_ENDER = 2003, - MOB_SPAWNED = 2004, - BONEMEAL = 2005, - DRAGON_BREATH = 2006, - POTION_INSTANT = 2007, - ENDER_DRAGON_ATTACK = 2008, - SPONGE_SUCK = 2009, - ENDER_DRAGON_DEFEATED = 3000, - ENDER_DRAGON_GROWL = 3001, - - UNKNOWN = 0; - - static void play(int event, WorldAccess world, BlockPos pos, BlockState state) { - world.syncWorldEvent(event, pos, Block.getRawIdFromState(state)); - } - - static void play(int event, WorldAccess world, BlockPos pos) { - world.syncWorldEvent(event, pos, 0); - } - -}