From 8ed49906fa0d7e3722988b9edfb82ba84e8f0288 Mon Sep 17 00:00:00 2001 From: Matt Worzala Date: Mon, 7 Jun 2021 00:55:41 -0400 Subject: [PATCH] change generated EntityType to use metas --- .../minestom/server/entity/EntityType.java | 53 +++---------------- .../entity/metadata/animal/GoatMeta.java | 2 +- 2 files changed, 8 insertions(+), 47 deletions(-) diff --git a/src/autogenerated/java/net/minestom/server/entity/EntityType.java b/src/autogenerated/java/net/minestom/server/entity/EntityType.java index beb115b7a..b7bbfe9ad 100644 --- a/src/autogenerated/java/net/minestom/server/entity/EntityType.java +++ b/src/autogenerated/java/net/minestom/server/entity/EntityType.java @@ -6,26 +6,7 @@ import net.kyori.adventure.key.Keyed; import net.minestom.server.entity.metadata.EntityMeta; import net.minestom.server.entity.metadata.PlayerMeta; import net.minestom.server.entity.metadata.ambient.BatMeta; -import net.minestom.server.entity.metadata.animal.BeeMeta; -import net.minestom.server.entity.metadata.animal.ChickenMeta; -import net.minestom.server.entity.metadata.animal.CowMeta; -import net.minestom.server.entity.metadata.animal.DonkeyMeta; -import net.minestom.server.entity.metadata.animal.FoxMeta; -import net.minestom.server.entity.metadata.animal.HoglinMeta; -import net.minestom.server.entity.metadata.animal.HorseMeta; -import net.minestom.server.entity.metadata.animal.LlamaMeta; -import net.minestom.server.entity.metadata.animal.MooshroomMeta; -import net.minestom.server.entity.metadata.animal.MuleMeta; -import net.minestom.server.entity.metadata.animal.OcelotMeta; -import net.minestom.server.entity.metadata.animal.PandaMeta; -import net.minestom.server.entity.metadata.animal.PigMeta; -import net.minestom.server.entity.metadata.animal.PolarBearMeta; -import net.minestom.server.entity.metadata.animal.RabbitMeta; -import net.minestom.server.entity.metadata.animal.SheepMeta; -import net.minestom.server.entity.metadata.animal.SkeletonHorseMeta; -import net.minestom.server.entity.metadata.animal.StriderMeta; -import net.minestom.server.entity.metadata.animal.TurtleMeta; -import net.minestom.server.entity.metadata.animal.ZombieHorseMeta; +import net.minestom.server.entity.metadata.animal.*; import net.minestom.server.entity.metadata.animal.tameable.CatMeta; import net.minestom.server.entity.metadata.animal.tameable.ParrotMeta; import net.minestom.server.entity.metadata.animal.tameable.WolfMeta; @@ -82,31 +63,11 @@ import net.minestom.server.entity.metadata.monster.zombie.HuskMeta; import net.minestom.server.entity.metadata.monster.zombie.ZombieMeta; import net.minestom.server.entity.metadata.monster.zombie.ZombieVillagerMeta; import net.minestom.server.entity.metadata.monster.zombie.ZombifiedPiglinMeta; -import net.minestom.server.entity.metadata.other.AreaEffectCloudMeta; -import net.minestom.server.entity.metadata.other.ArmorStandMeta; -import net.minestom.server.entity.metadata.other.BoatMeta; -import net.minestom.server.entity.metadata.other.DragonFireballMeta; -import net.minestom.server.entity.metadata.other.EndCrystalMeta; -import net.minestom.server.entity.metadata.other.EnderDragonMeta; -import net.minestom.server.entity.metadata.other.EvokerFangsMeta; -import net.minestom.server.entity.metadata.other.ExperienceOrbMeta; -import net.minestom.server.entity.metadata.other.FallingBlockMeta; -import net.minestom.server.entity.metadata.other.FireworkRocketMeta; -import net.minestom.server.entity.metadata.other.FishingHookMeta; -import net.minestom.server.entity.metadata.other.ItemFrameMeta; -import net.minestom.server.entity.metadata.other.LeashKnotMeta; -import net.minestom.server.entity.metadata.other.LightningBoltMeta; -import net.minestom.server.entity.metadata.other.LlamaSpitMeta; -import net.minestom.server.entity.metadata.other.MagmaCubeMeta; -import net.minestom.server.entity.metadata.other.PaintingMeta; -import net.minestom.server.entity.metadata.other.PrimedTntMeta; -import net.minestom.server.entity.metadata.other.ShulkerBulletMeta; -import net.minestom.server.entity.metadata.other.SlimeMeta; -import net.minestom.server.entity.metadata.other.TraderLlamaMeta; -import net.minestom.server.entity.metadata.other.WitherSkullMeta; +import net.minestom.server.entity.metadata.other.*; import net.minestom.server.entity.metadata.villager.VillagerMeta; import net.minestom.server.entity.metadata.villager.WanderingTraderMeta; import net.minestom.server.entity.metadata.water.DolphinMeta; +import net.minestom.server.entity.metadata.water.GlowSquidMeta; import net.minestom.server.entity.metadata.water.SquidMeta; import net.minestom.server.entity.metadata.water.fish.CodMeta; import net.minestom.server.entity.metadata.water.fish.PufferfishMeta; @@ -185,11 +146,11 @@ public enum EntityType implements Keyed { GIANT(NamespaceID.from("minecraft:giant"), 3.6, 12.0, GiantMeta::new, EntitySpawnType.LIVING), - GLOW_ITEM_FRAME(NamespaceID.from("minecraft:glow_item_frame"), 0.5, 0.5, EntityMeta::new, EntitySpawnType.BASE), + GLOW_ITEM_FRAME(NamespaceID.from("minecraft:glow_item_frame"), 0.5, 0.5, GlowFrameMeta::new, EntitySpawnType.BASE), - GLOW_SQUID(NamespaceID.from("minecraft:glow_squid"), 0.8, 0.8, EntityMeta::new, EntitySpawnType.LIVING), + GLOW_SQUID(NamespaceID.from("minecraft:glow_squid"), 0.8, 0.8, GlowSquidMeta::new, EntitySpawnType.LIVING), - GOAT(NamespaceID.from("minecraft:goat"), 0.9, 1.3, EntityMeta::new, EntitySpawnType.LIVING), + GOAT(NamespaceID.from("minecraft:goat"), 0.9, 1.3, GoatMeta::new, EntitySpawnType.LIVING), GUARDIAN(NamespaceID.from("minecraft:guardian"), 0.85, 0.85, GuardianMeta::new, EntitySpawnType.LIVING), @@ -219,7 +180,7 @@ public enum EntityType implements Keyed { MAGMA_CUBE(NamespaceID.from("minecraft:magma_cube"), 2.04, 2.04, MagmaCubeMeta::new, EntitySpawnType.LIVING), - MARKER(NamespaceID.from("minecraft:marker"), 0.0, 0.0, EntityMeta::new, EntitySpawnType.BASE), + MARKER(NamespaceID.from("minecraft:marker"), 0.0, 0.0, MarkerMeta::new, EntitySpawnType.BASE), MINECART(NamespaceID.from("minecraft:minecart"), 0.98, 0.7, MinecartMeta::new, EntitySpawnType.BASE), diff --git a/src/main/java/net/minestom/server/entity/metadata/animal/GoatMeta.java b/src/main/java/net/minestom/server/entity/metadata/animal/GoatMeta.java index d32dad551..f830d79b4 100644 --- a/src/main/java/net/minestom/server/entity/metadata/animal/GoatMeta.java +++ b/src/main/java/net/minestom/server/entity/metadata/animal/GoatMeta.java @@ -8,7 +8,7 @@ public class GoatMeta extends AnimalMeta { public static final byte OFFSET = AnimalMeta.MAX_OFFSET; public static final byte MAX_OFFSET = OFFSET + 1; - protected GoatMeta(@NotNull Entity entity, @NotNull Metadata metadata) { + public GoatMeta(@NotNull Entity entity, @NotNull Metadata metadata) { super(entity, metadata); }