From a3163d431f61619dae1698da2c57fc225a088db9 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 19 Dec 2022 19:50:15 +0100
Subject: [PATCH] Consolodate asWorld() implementations

---
 .../unicopia/EntityConvertable.java              |  8 +++++++-
 .../unicopia/WorldConvertable.java               |  7 +++++++
 .../unicopia/ability/magic/Caster.java           | 16 +---------------
 .../minelittlepony/unicopia/entity/Creature.java |  6 ------
 .../unicopia/particle/ParticleSource.java        |  4 ++--
 5 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/EntityConvertable.java b/src/main/java/com/minelittlepony/unicopia/EntityConvertable.java
index dcf4373e..ab37c15c 100644
--- a/src/main/java/com/minelittlepony/unicopia/EntityConvertable.java
+++ b/src/main/java/com/minelittlepony/unicopia/EntityConvertable.java
@@ -3,6 +3,7 @@ package com.minelittlepony.unicopia;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
 
 /**
  * Interface for things that can be owned by an entity.
@@ -11,7 +12,7 @@ import net.minecraft.util.math.Vec3d;
  *
  * @param <E> The type of object that owns us.
  */
-public interface EntityConvertable<E extends Entity> {
+public interface EntityConvertable<E extends Entity> extends WorldConvertable {
     E asEntity();
 
     /**
@@ -26,4 +27,9 @@ public interface EntityConvertable<E extends Entity> {
     default Vec3d getOriginVector() {
         return asEntity().getPos();
     }
+
+    @Override
+    default World asWorld() {
+        return asEntity().world;
+    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/WorldConvertable.java b/src/main/java/com/minelittlepony/unicopia/WorldConvertable.java
index fafe7662..2fada4bd 100644
--- a/src/main/java/com/minelittlepony/unicopia/WorldConvertable.java
+++ b/src/main/java/com/minelittlepony/unicopia/WorldConvertable.java
@@ -7,4 +7,11 @@ public interface WorldConvertable {
      * Gets the minecraft world
      */
     World asWorld();
+
+    /**
+     * Returns true if we're executing on the client.
+     */
+    default boolean isClient() {
+        return asWorld().isClient();
+    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java b/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java
index 57b5a60e..a5e753c4 100644
--- a/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/magic/Caster.java
@@ -21,7 +21,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.GameRules;
-import net.minecraft.world.World;
 
 /**
  * Interface for any magically capable entities that can cast or persist spells.
@@ -31,8 +30,7 @@ public interface Caster<E extends Entity> extends Owned<LivingEntity>,
         Affine,
         ParticleSource<E>,
         SoundEmitter<E>,
-        EntityConvertable<E>,
-        WorldConvertable {
+        EntityConvertable<E> {
 
     Physics getPhysics();
 
@@ -45,18 +43,6 @@ public interface Caster<E extends Entity> extends Owned<LivingEntity>,
      */
     boolean subtractEnergyCost(double amount);
 
-    @Override
-    default World asWorld() {
-        return asEntity().world;
-    }
-
-    /**
-     * Returns true if we're executing on the client.
-     */
-    default boolean isClient() {
-        return asWorld().isClient();
-    }
-
     default boolean canModifyAt(BlockPos pos) {
         return canModifyAt(pos, ModificationType.EITHER);
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/Creature.java b/src/main/java/com/minelittlepony/unicopia/entity/Creature.java
index 85e71459..a94ac4c4 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/Creature.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/Creature.java
@@ -32,7 +32,6 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
 
 public class Creature extends Living<LivingEntity> implements WeaklyOwned<LivingEntity> {
     private static final TrackedData<NbtCompound> EFFECT = DataTracker.registerData(LivingEntity.class, TrackedDataHandlerRegistry.NBT_COMPOUND);
@@ -75,11 +74,6 @@ public class Creature extends Living<LivingEntity> implements WeaklyOwned<Living
         return owner.getId().isPresent();
     }
 
-    @Override
-    public World asWorld() {
-        return super.asWorld();
-    }
-
     @Override
     @NotNull
     public LivingEntity getMaster() {
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/ParticleSource.java b/src/main/java/com/minelittlepony/unicopia/particle/ParticleSource.java
index 3e280cf8..adf2f431 100644
--- a/src/main/java/com/minelittlepony/unicopia/particle/ParticleSource.java
+++ b/src/main/java/com/minelittlepony/unicopia/particle/ParticleSource.java
@@ -20,11 +20,11 @@ public interface ParticleSource<E extends Entity> extends ParticleSpawner, Entit
     }
 
     default void spawnParticles(Vec3d pos, PointGenerator area, int count, Consumer<Vec3d> particleSpawner) {
-        area.translate(pos).randomPoints(count, asEntity().world.random).forEach(particleSpawner);
+        area.translate(pos).randomPoints(count, asWorld().random).forEach(particleSpawner);
     }
 
     @Override
     default void addParticle(ParticleEffect effect, Vec3d position, Vec3d velocity) {
-        ParticleUtils.spawnParticle(asEntity().world, effect, position, velocity);
+        ParticleUtils.spawnParticle(asWorld(), effect, position, velocity);
     }
 }