From dab4010d6cf40b9da001680b7e597ad9ed6d649e Mon Sep 17 00:00:00 2001 From: ian1337 Date: Mon, 28 Sep 2026 10:27:49 +0200 Subject: [PATCH] [change] move the Variants enum to a seperate package --- .../masterwild/entity/client/Pinguin/PinguinRenderer.java | 2 +- .../masterwild/entity/client/butterfly/ButterflyRenderer.java | 2 +- .../glitchlabs/masterwild/entity/custom/ButterflyEntity.java | 2 +- .../ovh/glitchlabs/masterwild/entity/custom/PinguinEntity.java | 2 +- .../ovh/glitchlabs/masterwild/entity/custom/RoosterEntity.java | 1 - .../masterwild/entity/{ => variants}/ButterflyVariants.java | 2 +- .../masterwild/entity/{ => variants}/PinguinVariants.java | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) rename src/main/java/ovh/glitchlabs/masterwild/entity/{ => variants}/ButterflyVariants.java (91%) rename src/main/java/ovh/glitchlabs/masterwild/entity/{ => variants}/PinguinVariants.java (91%) diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/client/Pinguin/PinguinRenderer.java b/src/main/java/ovh/glitchlabs/masterwild/entity/client/Pinguin/PinguinRenderer.java index 8fa144b..d01281f 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/client/Pinguin/PinguinRenderer.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/client/Pinguin/PinguinRenderer.java @@ -7,7 +7,7 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; import ovh.glitchlabs.masterwild.Masterwild; -import ovh.glitchlabs.masterwild.entity.PinguinVariants; +import ovh.glitchlabs.masterwild.entity.variants.PinguinVariants; import ovh.glitchlabs.masterwild.entity.custom.PinguinEntity; import java.util.Map; diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/client/butterfly/ButterflyRenderer.java b/src/main/java/ovh/glitchlabs/masterwild/entity/client/butterfly/ButterflyRenderer.java index e8bfa62..f297dcf 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/client/butterfly/ButterflyRenderer.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/client/butterfly/ButterflyRenderer.java @@ -6,7 +6,7 @@ import net.minecraft.client.renderer.entity.EntityRendererProvider; import net.minecraft.client.renderer.entity.MobRenderer; import net.minecraft.resources.ResourceLocation; import ovh.glitchlabs.masterwild.Masterwild; -import ovh.glitchlabs.masterwild.entity.ButterflyVariants; +import ovh.glitchlabs.masterwild.entity.variants.ButterflyVariants; import ovh.glitchlabs.masterwild.entity.custom.ButterflyEntity; import java.util.Map; diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/custom/ButterflyEntity.java b/src/main/java/ovh/glitchlabs/masterwild/entity/custom/ButterflyEntity.java index 8409452..0cf93e7 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/custom/ButterflyEntity.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/custom/ButterflyEntity.java @@ -24,7 +24,7 @@ import net.minecraft.world.level.ServerLevelAccessor; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; -import ovh.glitchlabs.masterwild.entity.ButterflyVariants; +import ovh.glitchlabs.masterwild.entity.variants.ButterflyVariants; public class ButterflyEntity extends Animal { private static final EntityDataAccessor VARIANT = diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/custom/PinguinEntity.java b/src/main/java/ovh/glitchlabs/masterwild/entity/custom/PinguinEntity.java index 2e08b56..eeabaff 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/custom/PinguinEntity.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/custom/PinguinEntity.java @@ -25,7 +25,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.ServerLevelAccessor; import org.jetbrains.annotations.Nullable; import ovh.glitchlabs.masterwild.entity.ModEntities; -import ovh.glitchlabs.masterwild.entity.PinguinVariants; +import ovh.glitchlabs.masterwild.entity.variants.PinguinVariants; public class PinguinEntity extends Animal { private static final Ingredient FOOD = Ingredient.of(Items.COD, Items.SALMON); diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/custom/RoosterEntity.java b/src/main/java/ovh/glitchlabs/masterwild/entity/custom/RoosterEntity.java index 891966c..d287cd4 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/custom/RoosterEntity.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/custom/RoosterEntity.java @@ -24,7 +24,6 @@ import ovh.glitchlabs.masterwild.Sounds.ModSounds; import ovh.glitchlabs.masterwild.entity.ModEntities; public class RoosterEntity extends Animal { - // -1 = noch kein Tag erfasst -> beim Laden/Betreten der Welt wird nicht gekräht private long lastDay = -1; private int crowDelay = -1; diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/ButterflyVariants.java b/src/main/java/ovh/glitchlabs/masterwild/entity/variants/ButterflyVariants.java similarity index 91% rename from src/main/java/ovh/glitchlabs/masterwild/entity/ButterflyVariants.java rename to src/main/java/ovh/glitchlabs/masterwild/entity/variants/ButterflyVariants.java index 47eaeac..7a3f86f 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/ButterflyVariants.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/variants/ButterflyVariants.java @@ -1,4 +1,4 @@ -package ovh.glitchlabs.masterwild.entity; +package ovh.glitchlabs.masterwild.entity.variants; import java.util.Arrays; import java.util.Comparator; diff --git a/src/main/java/ovh/glitchlabs/masterwild/entity/PinguinVariants.java b/src/main/java/ovh/glitchlabs/masterwild/entity/variants/PinguinVariants.java similarity index 91% rename from src/main/java/ovh/glitchlabs/masterwild/entity/PinguinVariants.java rename to src/main/java/ovh/glitchlabs/masterwild/entity/variants/PinguinVariants.java index f75d1c8..9d19cad 100644 --- a/src/main/java/ovh/glitchlabs/masterwild/entity/PinguinVariants.java +++ b/src/main/java/ovh/glitchlabs/masterwild/entity/variants/PinguinVariants.java @@ -1,4 +1,4 @@ -package ovh.glitchlabs.masterwild.entity; +package ovh.glitchlabs.masterwild.entity.variants; import java.util.Arrays; import java.util.Comparator;