From 91109ba8bb45b88e56f20233a8e9d67da87a9c89 Mon Sep 17 00:00:00 2001 From: Sollace Date: Thu, 7 Feb 2019 13:38:42 +0200 Subject: [PATCH] Use the enum! It makes it clearer --- .../minelittlepony/unicopia/block/BlockCloudAnvil.java | 4 ++-- .../com/minelittlepony/unicopia/power/PowerGrow.java | 4 ++-- .../com/minelittlepony/unicopia/power/PowerStomp.java | 5 +++-- .../minelittlepony/unicopia/spell/SpellNecromancy.java | 2 +- src/main/java/com/minelittlepony/util/WorldEvent.java | 10 ++++++++++ 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java index ae9b55b2..69e2c2ae 100644 --- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java +++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java @@ -62,12 +62,12 @@ public class BlockCloudAnvil extends BlockAnvil implements ICloudBlock { @Override public void onEndFalling(World world, BlockPos pos, IBlockState fallingState, IBlockState hitState) { - WorldEvent.ENTITY_TAKEOFF.play(world, pos, 0); + WorldEvent.ENTITY_TAKEOFF.play(world, pos); } @Override public void onBroken(World world, BlockPos pos) { - WorldEvent.ENTITY_TAKEOFF.play(world, pos, 0); + WorldEvent.ENTITY_TAKEOFF.play(world, pos); } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java b/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java index 1b17d18e..0ec6f515 100644 --- a/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java +++ b/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java @@ -86,10 +86,10 @@ public class PowerGrow implements IPower { if (g.canGrow(w, pos, state, w.isRemote) && g.canUseBonemeal(w, w.rand, pos, state)) { if (ItemDye.applyBonemeal(new ItemStack(Items.DYE, 1), w, pos)) { - WorldEvent.BONEMEAL.play(w, pos, 0); + WorldEvent.BONEMEAL.play(w, pos); if (g instanceof BlockDoublePlant) { - WorldEvent.BONEMEAL.play(w, pos.up(), 0); + WorldEvent.BONEMEAL.play(w, pos.up()); } } diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java b/src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java index 04650470..f53b77c6 100644 --- a/src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java +++ b/src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java @@ -15,6 +15,7 @@ import com.minelittlepony.unicopia.player.PlayerSpeciesList; import com.minelittlepony.unicopia.power.data.Location; import com.minelittlepony.util.MagicalDamageSource; import com.minelittlepony.util.PosHelper; +import com.minelittlepony.util.WorldEvent; import com.minelittlepony.util.shape.IShape; import com.minelittlepony.util.shape.Sphere; import com.minelittlepony.util.vector.VecHelper; @@ -181,7 +182,7 @@ public class PowerStomp implements IPower { if (state.getBlock() != Blocks.AIR) { if (w.getBlockState(pos.up()).getBlock() == Blocks.AIR) { - w.playEvent(2001, pos, Block.getStateId(state)); + WorldEvent.DESTROY_BLOCK.play(w, pos, state); } } } @@ -317,7 +318,7 @@ public class PowerStomp implements IPower { IBlockState state = w.getBlockState(pos); if (state.getBlock() instanceof BlockLeaves && w.getBlockState(pos.down()).getMaterial() == Material.AIR) { - w.playEvent(2001, pos, Block.getStateId(state)); + WorldEvent.DESTROY_BLOCK.play(w, pos, state); EntityItem item = new EntityItem(w); item.setPosition(pos.getX() + 0.5, pos.getY() - 0.5, pos.getZ() + 0.5); diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java index 78074e08..b857be84 100644 --- a/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java +++ b/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java @@ -96,7 +96,7 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell { } zombie.motionY += 0.3F; - source.getWorld().playEvent(WorldEvent.DOOR_BROKEN.getId(), zombie.getPosition(), 0); + WorldEvent.DOOR_BROKEN.play(source.getWorld(), zombie.getPosition()); source.getWorld().spawnEntity(zombie); } diff --git a/src/main/java/com/minelittlepony/util/WorldEvent.java b/src/main/java/com/minelittlepony/util/WorldEvent.java index f7f9a337..a23a90ca 100644 --- a/src/main/java/com/minelittlepony/util/WorldEvent.java +++ b/src/main/java/com/minelittlepony/util/WorldEvent.java @@ -1,5 +1,7 @@ package com.minelittlepony.util; +import net.minecraft.block.Block; +import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -72,6 +74,14 @@ public enum WorldEvent { return id; } + public void play(World world, BlockPos pos, IBlockState state) { + play(world, pos, Block.getStateId(state)); + } + + public void play(World world, BlockPos pos) { + play(world, pos, 0); + } + public void play(World world, BlockPos pos, int data) { world.playEvent(getId(), pos, data); }