201 lines
8.9 KiB
Java
201 lines
8.9 KiB
Java
|
|
# Eagler Context Redacted Diff
|
|
# Copyright (c) 2024 lax1dude. All rights reserved.
|
|
|
|
# Version: 1.0
|
|
# Author: lax1dude
|
|
|
|
> DELETE 2 @ 2 : 4
|
|
|
|
> CHANGE 4 : 11 @ 4 : 8
|
|
|
|
~
|
|
~ import com.google.common.collect.Lists;
|
|
~ import com.google.common.collect.Maps;
|
|
~
|
|
~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager;
|
|
~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger;
|
|
~ import net.lax1dude.eaglercraft.v1_8.minecraft.EntityConstructor;
|
|
|
|
> DELETE 66 @ 66 : 68
|
|
|
|
> INSERT 4 : 6 @ 4
|
|
|
|
+ private static final Map<String, EntityConstructor<? extends Entity>> stringToConstructorMapping = Maps
|
|
+ .newHashMap();
|
|
|
|
> INSERT 2 : 3 @ 2
|
|
|
|
+ private static final Map<Integer, EntityConstructor<? extends Entity>> idToConstructorMapping = Maps.newHashMap();
|
|
|
|
> INSERT 1 : 3 @ 1
|
|
|
|
+ private static final Map<Class<? extends Entity>, EntityConstructor<? extends Entity>> classToConstructorMapping = Maps
|
|
+ .newHashMap();
|
|
|
|
> CHANGE 3 : 5 @ 3 : 4
|
|
|
|
~ private static void addMapping(Class<? extends Entity> entityClass,
|
|
~ EntityConstructor<? extends Entity> entityConstructor, String entityName, int id) {
|
|
|
|
> INSERT 10 : 11 @ 10
|
|
|
|
+ stringToConstructorMapping.put(entityName, entityConstructor);
|
|
|
|
> INSERT 2 : 3 @ 2
|
|
|
|
+ idToConstructorMapping.put(Integer.valueOf(id), entityConstructor);
|
|
|
|
> INSERT 1 : 2 @ 1
|
|
|
|
+ classToConstructorMapping.put(entityClass, entityConstructor);
|
|
|
|
> CHANGE 4 : 6 @ 4 : 5
|
|
|
|
~ private static void addMapping(Class<? extends Entity> entityClass,
|
|
~ EntityConstructor<? extends Entity> entityConstructor, String entityName, int entityID, int baseColor,
|
|
|
|
> CHANGE 1 : 2 @ 1 : 2
|
|
|
|
~ addMapping(entityClass, entityConstructor, entityName, entityID);
|
|
|
|
> CHANGE 7 : 10 @ 7 : 11
|
|
|
|
~ EntityConstructor<? extends Entity> constructor = stringToConstructorMapping.get(entityName);
|
|
~ if (constructor != null) {
|
|
~ entity = constructor.createEntity(worldIn);
|
|
|
|
> CHANGE 2 : 3 @ 2 : 3
|
|
|
|
~ logger.error("Could not create entity", exception);
|
|
|
|
> INSERT 5 : 28 @ 5
|
|
|
|
+ public static Entity createEntityByClass(Class<? extends Entity> entityClass, World worldIn) {
|
|
+ Entity entity = null;
|
|
+
|
|
+ try {
|
|
+ EntityConstructor<? extends Entity> constructor = classToConstructorMapping.get(entityClass);
|
|
+ if (constructor != null) {
|
|
+ entity = constructor.createEntity(worldIn);
|
|
+ }
|
|
+ } catch (Exception exception) {
|
|
+ logger.error("Could not create entity", exception);
|
|
+ }
|
|
+
|
|
+ return entity;
|
|
+ }
|
|
+
|
|
+ public static Entity createEntityByClassUnsafe(Class<? extends Entity> entityClass, World worldIn) {
|
|
+ EntityConstructor<? extends Entity> constructor = classToConstructorMapping.get(entityClass);
|
|
+ if (constructor != null) {
|
|
+ return constructor.createEntity(worldIn);
|
|
+ }
|
|
+ return null;
|
|
+ }
|
|
+
|
|
|
|
> CHANGE 8 : 11 @ 8 : 12
|
|
|
|
~ EntityConstructor<? extends Entity> constructor = stringToConstructorMapping.get(nbt.getString("id"));
|
|
~ if (constructor != null) {
|
|
~ entity = constructor.createEntity(worldIn);
|
|
|
|
> CHANGE 2 : 3 @ 2 : 3
|
|
|
|
~ logger.error("Could not create entity", exception);
|
|
|
|
> CHANGE 15 : 18 @ 15 : 19
|
|
|
|
~ EntityConstructor<? extends Entity> constructor = getConstructorFromID(entityID);
|
|
~ if (constructor != null) {
|
|
~ entity = constructor.createEntity(worldIn);
|
|
|
|
> CHANGE 2 : 3 @ 2 : 3
|
|
|
|
~ logger.error("Could not create entity", exception);
|
|
|
|
> INSERT 18 : 22 @ 18
|
|
|
|
+ public static EntityConstructor<? extends Entity> getConstructorFromID(int entityID) {
|
|
+ return idToConstructorMapping.get(Integer.valueOf(entityID));
|
|
+ }
|
|
+
|
|
|
|
> CHANGE 17 : 18 @ 17 : 18
|
|
|
|
~ Set<String> set = stringToClassMapping.keySet();
|
|
|
|
> CHANGE 29 : 97 @ 29 : 91
|
|
|
|
~ addMapping(EntityItem.class, EntityItem::new, "Item", 1);
|
|
~ addMapping(EntityXPOrb.class, EntityXPOrb::new, "XPOrb", 2);
|
|
~ addMapping(EntityEgg.class, EntityEgg::new, "ThrownEgg", 7);
|
|
~ addMapping(EntityLeashKnot.class, EntityLeashKnot::new, "LeashKnot", 8);
|
|
~ addMapping(EntityPainting.class, EntityPainting::new, "Painting", 9);
|
|
~ addMapping(EntityArrow.class, EntityArrow::new, "Arrow", 10);
|
|
~ addMapping(EntitySnowball.class, EntitySnowball::new, "Snowball", 11);
|
|
~ addMapping(EntityLargeFireball.class, EntityLargeFireball::new, "Fireball", 12);
|
|
~ addMapping(EntitySmallFireball.class, EntitySmallFireball::new, "SmallFireball", 13);
|
|
~ addMapping(EntityEnderPearl.class, EntityEnderPearl::new, "ThrownEnderpearl", 14);
|
|
~ addMapping(EntityEnderEye.class, EntityEnderEye::new, "EyeOfEnderSignal", 15);
|
|
~ addMapping(EntityPotion.class, EntityPotion::new, "ThrownPotion", 16);
|
|
~ addMapping(EntityExpBottle.class, EntityExpBottle::new, "ThrownExpBottle", 17);
|
|
~ addMapping(EntityItemFrame.class, EntityItemFrame::new, "ItemFrame", 18);
|
|
~ addMapping(EntityWitherSkull.class, EntityWitherSkull::new, "WitherSkull", 19);
|
|
~ addMapping(EntityTNTPrimed.class, EntityTNTPrimed::new, "PrimedTnt", 20);
|
|
~ addMapping(EntityFallingBlock.class, EntityFallingBlock::new, "FallingSand", 21);
|
|
~ addMapping(EntityFireworkRocket.class, EntityFireworkRocket::new, "FireworksRocketEntity", 22);
|
|
~ addMapping(EntityArmorStand.class, EntityArmorStand::new, "ArmorStand", 30);
|
|
~ addMapping(EntityBoat.class, EntityBoat::new, "Boat", 41);
|
|
~ addMapping(EntityMinecartEmpty.class, EntityMinecartEmpty::new,
|
|
~ EntityMinecart.EnumMinecartType.RIDEABLE.getName(), 42);
|
|
~ addMapping(EntityMinecartChest.class, EntityMinecartChest::new, EntityMinecart.EnumMinecartType.CHEST.getName(),
|
|
~ 43);
|
|
~ addMapping(EntityMinecartFurnace.class, EntityMinecartFurnace::new,
|
|
~ EntityMinecart.EnumMinecartType.FURNACE.getName(), 44);
|
|
~ addMapping(EntityMinecartTNT.class, EntityMinecartTNT::new, EntityMinecart.EnumMinecartType.TNT.getName(), 45);
|
|
~ addMapping(EntityMinecartHopper.class, EntityMinecartHopper::new,
|
|
~ EntityMinecart.EnumMinecartType.HOPPER.getName(), 46);
|
|
~ addMapping(EntityMinecartMobSpawner.class, EntityMinecartMobSpawner::new,
|
|
~ EntityMinecart.EnumMinecartType.SPAWNER.getName(), 47);
|
|
~ addMapping(EntityMinecartCommandBlock.class, EntityMinecartCommandBlock::new,
|
|
~ EntityMinecart.EnumMinecartType.COMMAND_BLOCK.getName(), 40);
|
|
~ addMapping(EntityLiving.class, null, "Mob", 48);
|
|
~ addMapping(EntityMob.class, null, "Monster", 49);
|
|
~ addMapping(EntityCreeper.class, EntityCreeper::new, "Creeper", 50, 894731, 0);
|
|
~ addMapping(EntitySkeleton.class, EntitySkeleton::new, "Skeleton", 51, 12698049, 4802889);
|
|
~ addMapping(EntitySpider.class, EntitySpider::new, "Spider", 52, 3419431, 11013646);
|
|
~ addMapping(EntityGiantZombie.class, EntityGiantZombie::new, "Giant", 53);
|
|
~ addMapping(EntityZombie.class, EntityZombie::new, "Zombie", 54, '\uafaf', 7969893);
|
|
~ addMapping(EntitySlime.class, EntitySlime::new, "Slime", 55, 5349438, 8306542);
|
|
~ addMapping(EntityGhast.class, EntityGhast::new, "Ghast", 56, 16382457, 12369084);
|
|
~ addMapping(EntityPigZombie.class, EntityPigZombie::new, "PigZombie", 57, 15373203, 5009705);
|
|
~ addMapping(EntityEnderman.class, EntityEnderman::new, "Enderman", 58, 1447446, 0);
|
|
~ addMapping(EntityCaveSpider.class, EntityCaveSpider::new, "CaveSpider", 59, 803406, 11013646);
|
|
~ addMapping(EntitySilverfish.class, EntitySilverfish::new, "Silverfish", 60, 7237230, 3158064);
|
|
~ addMapping(EntityBlaze.class, EntityBlaze::new, "Blaze", 61, 16167425, 16775294);
|
|
~ addMapping(EntityMagmaCube.class, EntityMagmaCube::new, "LavaSlime", 62, 3407872, 16579584);
|
|
~ addMapping(EntityDragon.class, EntityDragon::new, "EnderDragon", 63);
|
|
~ addMapping(EntityWither.class, EntityWither::new, "WitherBoss", 64);
|
|
~ addMapping(EntityBat.class, EntityBat::new, "Bat", 65, 4996656, 986895);
|
|
~ addMapping(EntityWitch.class, EntityWitch::new, "Witch", 66, 3407872, 5349438);
|
|
~ addMapping(EntityEndermite.class, EntityEndermite::new, "Endermite", 67, 1447446, 7237230);
|
|
~ addMapping(EntityGuardian.class, EntityGuardian::new, "Guardian", 68, 5931634, 15826224);
|
|
~ addMapping(EntityPig.class, EntityPig::new, "Pig", 90, 15771042, 14377823);
|
|
~ addMapping(EntitySheep.class, EntitySheep::new, "Sheep", 91, 15198183, 16758197);
|
|
~ addMapping(EntityCow.class, EntityCow::new, "Cow", 92, 4470310, 10592673);
|
|
~ addMapping(EntityChicken.class, EntityChicken::new, "Chicken", 93, 10592673, 16711680);
|
|
~ addMapping(EntitySquid.class, EntitySquid::new, "Squid", 94, 2243405, 7375001);
|
|
~ addMapping(EntityWolf.class, EntityWolf::new, "Wolf", 95, 14144467, 13545366);
|
|
~ addMapping(EntityMooshroom.class, EntityMooshroom::new, "MushroomCow", 96, 10489616, 12040119);
|
|
~ addMapping(EntitySnowman.class, EntitySnowman::new, "SnowMan", 97);
|
|
~ addMapping(EntityOcelot.class, EntityOcelot::new, "Ozelot", 98, 15720061, 5653556);
|
|
~ addMapping(EntityIronGolem.class, EntityIronGolem::new, "VillagerGolem", 99);
|
|
~ addMapping(EntityHorse.class, EntityHorse::new, "EntityHorse", 100, 12623485, 15656192);
|
|
~ addMapping(EntityRabbit.class, EntityRabbit::new, "Rabbit", 101, 10051392, 7555121);
|
|
~ addMapping(EntityVillager.class, EntityVillager::new, "Villager", 120, 5651507, 12422002);
|
|
~ addMapping(EntityEnderCrystal.class, EntityEnderCrystal::new, "EnderCrystal", 200);
|
|
|
|
> EOF
|