Skip to content

Commit fe61616

Browse files
authored
Merge pull request #37 from OakLoaf/master
MetaConverterRegistry changes
2 parents 4682ddd + 6af48b9 commit fe61616

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

api/src/main/java/me/tofaa/entitylib/meta/MetaConverterRegistry.java

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ final class MetaConverterRegistry {
4949
MetaConverterRegistry() {
5050
put(ABSTRACT_WIND_CHARGE, SmallFireballMeta.class, SmallFireballMeta::new); // TODO: Verify correctness
5151
put(AREA_EFFECT_CLOUD, AreaEffectCloudMeta.class, AreaEffectCloudMeta::new);
52+
put(ALLAY, LivingEntityMeta.class, LivingEntityMeta::new); // TODO: Implement
5253
put(ARMADILLO, ArmadilloMeta.class, ArmadilloMeta::new); // TODO: Verify correctness
5354
put(ARMOR_STAND, ArmorStandMeta.class, ArmorStandMeta::new);
54-
put(ALLAY, LivingEntityMeta.class, LivingEntityMeta::new); // TODO: Implement
5555
put(ARROW, ArrowMeta.class, ArrowMeta::new);
5656
put(AXOLOTL, AxolotlMeta.class, AxolotlMeta::new);
5757
put(BAT, BatMeta.class, BatMeta::new);
@@ -68,8 +68,9 @@ final class MetaConverterRegistry {
6868
put(CHEST_MINECART, ChestMinecartMeta.class, ChestMinecartMeta::new);
6969
put(CHICKEN, ChickenMeta.class, ChickenMeta::new);
7070
put(COD, CodMeta.class, CodMeta::new);
71-
put(COW, CowMeta.class, CowMeta::new);
7271
put(COMMAND_BLOCK_MINECART, CommandBlockMinecartMeta.class, CommandBlockMinecartMeta::new);
72+
put(COW, CowMeta.class, CowMeta::new);
73+
put(CREAKING, LivingEntityMeta.class, LivingEntityMeta::new); // TODO: Implement
7374
put(CREEPER, CreeperMeta.class, CreeperMeta::new);
7475
put(DOLPHIN, DolphinMeta.class, DolphinMeta::new);
7576
put(DONKEY, DonkeyMeta.class, DonkeyMeta::new);
@@ -79,58 +80,62 @@ final class MetaConverterRegistry {
7980
put(ELDER_GUARDIAN, ElderGuardianMeta.class, ElderGuardianMeta::new);
8081
put(END_CRYSTAL, EndCrystalMeta.class, EndCrystalMeta::new);
8182
put(ENDER_DRAGON, EnderDragonMeta.class, EnderDragonMeta::new);
83+
put(ENDER_PEARL, ThrownEnderPearlMeta.class, ThrownEnderPearlMeta::new);
8284
put(ENDERMAN, EndermanMeta.class, EndermanMeta::new);
8385
put(ENDERMITE, EndermiteMeta.class, EndermiteMeta::new);
8486
put(EVOKER, EvokerMeta.class, EvokerMeta::new);
85-
put(EYE_OF_ENDER, EyeOfEnderMeta.class, EyeOfEnderMeta::new);
8687
put(EVOKER_FANGS, EvokerFangsMeta.class, EvokerFangsMeta::new);
88+
put(EYE_OF_ENDER, EyeOfEnderMeta.class, EyeOfEnderMeta::new);
8789
put(FALLING_BLOCK, FallingBlockMeta.class, FallingBlockMeta::new);
8890
put(FIREBALL, LargeFireballMeta.class, LargeFireballMeta::new); // TODO: Verify correctness
8991
put(FIREWORK_ROCKET, FireworkRocketMeta.class, FireworkRocketMeta::new);
9092
put(FISHING_BOBBER, FishingHookMeta.class, FishingHookMeta::new);
9193
put(FOX, FoxMeta.class, FoxMeta::new);
9294
put(FROG, FrogMeta.class, FrogMeta::new);
9395
put(FURNACE_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new);
96+
put(GHAST, GhastMeta.class, GhastMeta::new);
9497
put(GIANT, GiantMeta.class, GiantMeta::new);
9598
put(GLOW_ITEM_FRAME, GlowItemFrameMeta.class, GlowItemFrameMeta::new);
9699
put(GLOW_SQUID, GlowSquidMeta.class, GlowSquidMeta::new);
97100
put(GOAT, GoatMeta.class, GoatMeta::new);
98101
put(GUARDIAN, GuardianMeta.class, GuardianMeta::new);
102+
put(HAPPY_GHAST, GhastMeta.class, GhastMeta::new); // TODO: Implement
99103
put(HOGLIN, HoglinMeta.class, HoglinMeta::new);
100104
put(HOPPER_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new);
101105
put(HORSE, HorseMeta.class, HorseMeta::new);
102106
put(HUSK, HuskMeta.class, HuskMeta::new);
103107
put(ILLUSIONER, IllusionerMeta.class, IllusionerMeta::new);
104108
put(INTERACTION, InteractionMeta.class, InteractionMeta::new);
105109
put(IRON_GOLEM, IronGolemMeta.class, IronGolemMeta::new);
110+
put(ITEM, ItemEntityMeta.class, ItemEntityMeta::new);
106111
put(ITEM_DISPLAY, ItemDisplayMeta.class, ItemDisplayMeta::new);
107112
put(ITEM_FRAME, ItemFrameMeta.class, ItemFrameMeta::new);
108-
put(ITEM, ItemEntityMeta.class, ItemEntityMeta::new);
109113
put(LEASH_KNOT, LeashKnotMeta.class, LeashKnotMeta::new);
110114
put(LIGHTNING_BOLT, LightningBoltMeta.class, LightningBoltMeta::new);
111115
put(LLAMA, LlamaMeta.class, LlamaMeta::new);
112116
put(LLAMA_SPIT, LlamaSpitMeta.class, LlamaSpitMeta::new);
113117
put(MAGMA_CUBE, MagmaCubeMeta.class, MagmaCubeMeta::new);
114118
put(MARKER, MarkerMeta.class, MarkerMeta::new);
119+
put(MOOSHROOM, MooshroomMeta.class, MooshroomMeta::new);
115120
put(MULE, MuleMeta.class, MuleMeta::new);
116121
put(OCELOT, OcelotMeta.class, OcelotMeta::new);
117122
put(PAINTING, PaintingMeta.class, PaintingMeta::new);
118123
put(PANDA, PandaMeta.class, PandaMeta::new);
119-
put(POTION, ThrownPotionMeta.class, ThrownPotionMeta::new);
120124
put(PARROT, ParrotMeta.class, ParrotMeta::new);
125+
put(PHANTOM, PhantomMeta.class, PhantomMeta::new);
121126
put(PIG, PigMeta.class, PigMeta::new);
122127
put(PIGLIN, PiglinMeta.class, PiglinMeta::new);
123128
put(PIGLIN_BRUTE, PiglinBruteMeta.class, PiglinBruteMeta::new);
124129
put(PILLAGER, PillagerMeta.class, PillagerMeta::new);
125130
put(PLAYER, PlayerMeta.class, PlayerMeta::new);
126131
put(POLAR_BEAR, PolarBearMeta.class, PolarBearMeta::new);
132+
put(POTION, ThrownPotionMeta.class, ThrownPotionMeta::new);
127133
put(PRIMED_TNT, PrimedTntMeta.class, PrimedTntMeta::new);
128134
put(PUFFERFISH, PufferFishMeta.class, PufferFishMeta::new);
129135
put(RABBIT, RabbitMeta.class, RabbitMeta::new);
130136
put(RAVAGER, RavagerMeta.class, RavagerMeta::new);
131137
put(SALMON, SalmonMeta.class, SalmonMeta::new);
132138
put(SHEEP, SheepMeta.class, SheepMeta::new);
133-
put(SNOWBALL, SnowballMeta.class, SnowballMeta::new);
134139
put(SHULKER, ShulkerMeta.class, ShulkerMeta::new);
135140
put(SHULKER_BULLET, ShulkerBulletMeta.class, ShulkerBulletMeta::new);
136141
put(SILVERFISH, SilverfishMeta.class, SilverfishMeta::new);
@@ -140,14 +145,15 @@ final class MetaConverterRegistry {
140145
put(SMALL_FIREBALL, SmallFireballMeta.class, SmallFireballMeta::new);
141146
put(SNIFFER, SnifferMeta.class, SnifferMeta::new);
142147
put(SNOW_GOLEM, SnowGolemMeta.class, SnowGolemMeta::new);
148+
put(SNOWBALL, SnowballMeta.class, SnowballMeta::new);
143149
put(SPAWNER_MINECART, SpawnerMinecartMeta.class, SpawnerMinecartMeta::new);
144150
put(SPIDER, SpiderMeta.class, SpiderMeta::new);
151+
put(SQUID, SquidMeta.class, SquidMeta::new);
145152
put(STRAY, StrayMeta.class, StrayMeta::new);
146153
put(STRIDER, StriderMeta.class, StriderMeta::new);
147154
put(TADPOLE, LivingEntityMeta.class, LivingEntityMeta::new); // TODO: Implement
148155
put(TEXT_DISPLAY, TextDisplayMeta.class, TextDisplayMeta::new);
149156
put(THROWN_EXP_BOTTLE, ThrownExpBottleMeta.class, ThrownExpBottleMeta::new);
150-
put(ENDER_PEARL, ThrownEnderPearlMeta.class, ThrownEnderPearlMeta::new);
151157
put(TNT_MINECART, TntMinecartMeta.class, TntMinecartMeta::new);
152158
put(TRADER_LLAMA, TraderLlamaMeta.class, TraderLlamaMeta::new);
153159
put(TRIDENT, ThrownTridentMeta.class, ThrownTridentMeta::new);

0 commit comments

Comments
 (0)