From b1aef9160ddfef5414d77c1d148d51e4aee71ef6 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 10 Dec 2022 00:22:24 +0000 Subject: [PATCH] Terrible class name is still terrible --- .../com/minelittlepony/unicopia/entity/EntityPhysics.java | 4 ++-- .../java/com/minelittlepony/unicopia/entity/ItemTracker.java | 4 ++-- .../java/com/minelittlepony/unicopia/entity/player/Pony.java | 2 +- .../unicopia/util/{Copieable.java => Copyable.java} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/com/minelittlepony/unicopia/util/{Copieable.java => Copyable.java} (57%) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java index 51e8dea6..d7bbfdca 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityPhysics.java @@ -1,6 +1,6 @@ package com.minelittlepony.unicopia.entity; -import com.minelittlepony.unicopia.util.Copieable; +import com.minelittlepony.unicopia.util.Copyable; import com.minelittlepony.unicopia.util.Tickable; import net.minecraft.block.BlockRenderType; @@ -19,7 +19,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; -public class EntityPhysics implements Physics, Copieable>, Tickable { +public class EntityPhysics implements Physics, Copyable>, Tickable { private final TrackedData gravity; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java index 0b4cc12a..0ccaeb29 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/ItemTracker.java @@ -4,7 +4,7 @@ import java.util.*; import java.util.function.Predicate; import java.util.stream.Stream; -import com.minelittlepony.unicopia.util.Copieable; +import com.minelittlepony.unicopia.util.Copyable; import com.minelittlepony.unicopia.util.NbtSerialisable; import net.minecraft.entity.LivingEntity; @@ -15,7 +15,7 @@ import net.minecraft.nbt.NbtCompound; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -public class ItemTracker implements NbtSerialisable, Copieable { +public class ItemTracker implements NbtSerialisable, Copyable { public static final long TICKS = 1; public static final long SECONDS = 20 * TICKS; public static final long HOURS = 1000 * TICKS; diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java index ce800f9c..1a075486 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java @@ -59,7 +59,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.*; import net.minecraft.world.GameMode; -public class Pony extends Living implements Copieable, UpdateCallback { +public class Pony extends Living implements Copyable, UpdateCallback { private static final TrackedData RACE = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.STRING); diff --git a/src/main/java/com/minelittlepony/unicopia/util/Copieable.java b/src/main/java/com/minelittlepony/unicopia/util/Copyable.java similarity index 57% rename from src/main/java/com/minelittlepony/unicopia/util/Copieable.java rename to src/main/java/com/minelittlepony/unicopia/util/Copyable.java index d91b5a26..907e8615 100644 --- a/src/main/java/com/minelittlepony/unicopia/util/Copieable.java +++ b/src/main/java/com/minelittlepony/unicopia/util/Copyable.java @@ -1,5 +1,5 @@ package com.minelittlepony.unicopia.util; -public interface Copieable> { +public interface Copyable> { void copyFrom(T other); }