Skip to content

Commit

Permalink
add basic 1.14 support (#65)
Browse files Browse the repository at this point in the history 
* added 1.14 support
  • Loading branch information
@MrKinau
MrKinau authored Feb 21, 2020
1 parent 6886a24 commit 32d2d16
Show file tree
Hide file tree
Showing 4 changed files with 782 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,12 @@
<version>v1_15_R1</version>
</dependency>

<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-v1_14_R1</artifactId>
<version>v1_14_R1</version>
</dependency>

<dependency>
<groupId>org.bukkit</groupId>
<artifactId>craftbukkit-1.13.2</artifactId>
Expand Down
211 changes: 211 additions & 0 deletions src/main/java/eu/phiwa/dragontravel/nms/v1_14_R1/CustomEntityRegistry.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
/*
SOURCE :
https://github.com/CitizensDev/Citizens2/blob/master/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/CustomEntityRegistry.java
Yes, I admit, I'm a super lazy person !
*/

package eu.phiwa.dragontravel.nms.v1_14_R1;

import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Maps;
import net.minecraft.server.v1_14_R1.*;

import java.util.*;

@SuppressWarnings("rawtypes")
public class CustomEntityRegistry extends RegistryBlocks {
private final BiMap<MinecraftKey, EntityTypes> entities = HashBiMap.create();
private final BiMap<EntityTypes, MinecraftKey> entityClasses = this.entities.inverse();
private final Map<EntityTypes, Integer> entityIds = Maps.newHashMap();
private final RegistryMaterials<EntityTypes<?>> wrapped;

public CustomEntityRegistry(RegistryBlocks<EntityTypes<?>> original) {
super(original.a().getKey());
this.wrapped = original;
}

@Override
public int a(Object key) {
if (entityIds.containsKey(key)) {
return entityIds.get(key);
}

return wrapped.a((EntityTypes) key);
}

@Override
public Object a(Random paramRandom) {
return wrapped.a(paramRandom);
}

public EntityTypes findType(Class<?> search) {
return minecraftClassMap.inverse().get(search);
/*
for (Object type : wrapped) {
if (minecraftClassMap.get(type) == search) {
return (EntityTypes) type;
}
}
return null;
*/
}

@Override
public Object fromId(int var0) {
return this.wrapped.fromId(var0);
}

@Override
public EntityTypes get(MinecraftKey key) {
if (entities.containsKey(key)) {
return entities.get(key);
}

return wrapped.get(key);
}

@Override
public MinecraftKey getKey(Object value) {
if (entityClasses.containsKey(value)) {
return entityClasses.get(value);
}

return wrapped.getKey((EntityTypes) value);
}

@Override
public Optional getOptional(MinecraftKey var0) {
if (entities.containsKey(var0)) {
return Optional.of(entities.get(var0));
}

return Optional.ofNullable(this.wrapped.get(var0));
}

public RegistryMaterials<EntityTypes<?>> getWrapped() {
return wrapped;
}

@Override
public Iterator<Object> iterator() {
return (Iterator) wrapped.iterator();
}

@Override
public Set<Object> keySet() {
return (Set) wrapped.keySet();
}

public void put(int entityId, MinecraftKey key, EntityTypes entityClass) {
entities.put(key, entityClass);
entityIds.put(entityClass, entityId);
}

// replace regex
// ([A-Z_]+).*?a\(E(.*?)::new.*?$
// minecraftClassMap.put(EntityTypes.\1, E\2.class);
private static final BiMap<EntityTypes, Class<?>> minecraftClassMap = HashBiMap.create();
static {
minecraftClassMap.put(EntityTypes.AREA_EFFECT_CLOUD, EntityAreaEffectCloud.class);
minecraftClassMap.put(EntityTypes.ARMOR_STAND, EntityArmorStand.class);
minecraftClassMap.put(EntityTypes.ARROW, EntityTippedArrow.class);
minecraftClassMap.put(EntityTypes.BAT, EntityBat.class);
minecraftClassMap.put(EntityTypes.BLAZE, EntityBlaze.class);
minecraftClassMap.put(EntityTypes.BOAT, EntityBoat.class);
minecraftClassMap.put(EntityTypes.CAT, EntityCat.class);
minecraftClassMap.put(EntityTypes.CAVE_SPIDER, EntityCaveSpider.class);
minecraftClassMap.put(EntityTypes.CHICKEN, EntityChicken.class);
minecraftClassMap.put(EntityTypes.COD, EntityCod.class);
minecraftClassMap.put(EntityTypes.COW, EntityCow.class);
minecraftClassMap.put(EntityTypes.CREEPER, EntityCreeper.class);
minecraftClassMap.put(EntityTypes.DONKEY, EntityHorseDonkey.class);
minecraftClassMap.put(EntityTypes.DOLPHIN, EntityDolphin.class);
minecraftClassMap.put(EntityTypes.DRAGON_FIREBALL, EntityDragonFireball.class);
minecraftClassMap.put(EntityTypes.DROWNED, EntityDrowned.class);
minecraftClassMap.put(EntityTypes.ELDER_GUARDIAN, EntityGuardianElder.class);
minecraftClassMap.put(EntityTypes.END_CRYSTAL, EntityEnderCrystal.class);
minecraftClassMap.put(EntityTypes.ENDER_DRAGON, EntityEnderDragon.class);
minecraftClassMap.put(EntityTypes.ENDERMAN, EntityEnderman.class);
minecraftClassMap.put(EntityTypes.ENDERMITE, EntityEndermite.class);
minecraftClassMap.put(EntityTypes.EVOKER_FANGS, EntityEvokerFangs.class);
minecraftClassMap.put(EntityTypes.EVOKER, EntityEvoker.class);
minecraftClassMap.put(EntityTypes.EXPERIENCE_ORB, EntityExperienceOrb.class);
minecraftClassMap.put(EntityTypes.EYE_OF_ENDER, EntityEnderSignal.class);
minecraftClassMap.put(EntityTypes.FALLING_BLOCK, EntityFallingBlock.class);
minecraftClassMap.put(EntityTypes.FIREWORK_ROCKET, EntityFireworks.class);
minecraftClassMap.put(EntityTypes.FOX, EntityFox.class);
minecraftClassMap.put(EntityTypes.GHAST, EntityGhast.class);
minecraftClassMap.put(EntityTypes.GIANT, EntityGiantZombie.class);
minecraftClassMap.put(EntityTypes.GUARDIAN, EntityGuardian.class);
minecraftClassMap.put(EntityTypes.HORSE, EntityHorse.class);
minecraftClassMap.put(EntityTypes.HUSK, EntityZombieHusk.class);
minecraftClassMap.put(EntityTypes.ILLUSIONER, EntityIllagerIllusioner.class);
minecraftClassMap.put(EntityTypes.ITEM, EntityItem.class);
minecraftClassMap.put(EntityTypes.ITEM_FRAME, EntityItemFrame.class);
minecraftClassMap.put(EntityTypes.FIREBALL, EntityLargeFireball.class);
minecraftClassMap.put(EntityTypes.LEASH_KNOT, EntityLeash.class);
minecraftClassMap.put(EntityTypes.LLAMA, EntityLlama.class);
minecraftClassMap.put(EntityTypes.LLAMA_SPIT, EntityLlamaSpit.class);
minecraftClassMap.put(EntityTypes.MAGMA_CUBE, EntityMagmaCube.class);
minecraftClassMap.put(EntityTypes.MINECART, EntityMinecartRideable.class);
minecraftClassMap.put(EntityTypes.CHEST_MINECART, EntityMinecartChest.class);
minecraftClassMap.put(EntityTypes.COMMAND_BLOCK_MINECART, EntityMinecartCommandBlock.class);
minecraftClassMap.put(EntityTypes.FURNACE_MINECART, EntityMinecartFurnace.class);
minecraftClassMap.put(EntityTypes.HOPPER_MINECART, EntityMinecartHopper.class);
minecraftClassMap.put(EntityTypes.SPAWNER_MINECART, EntityMinecartMobSpawner.class);
minecraftClassMap.put(EntityTypes.TNT_MINECART, EntityMinecartTNT.class);
minecraftClassMap.put(EntityTypes.MULE, EntityHorseMule.class);
minecraftClassMap.put(EntityTypes.MOOSHROOM, EntityMushroomCow.class);
minecraftClassMap.put(EntityTypes.OCELOT, EntityOcelot.class);
minecraftClassMap.put(EntityTypes.PAINTING, EntityPainting.class);
minecraftClassMap.put(EntityTypes.PANDA, EntityPanda.class);
minecraftClassMap.put(EntityTypes.PARROT, EntityParrot.class);
minecraftClassMap.put(EntityTypes.PIG, EntityPig.class);
minecraftClassMap.put(EntityTypes.PUFFERFISH, EntityPufferFish.class);
minecraftClassMap.put(EntityTypes.ZOMBIE_PIGMAN, EntityPigZombie.class);
minecraftClassMap.put(EntityTypes.POLAR_BEAR, EntityPolarBear.class);
minecraftClassMap.put(EntityTypes.TNT, EntityTNTPrimed.class);
minecraftClassMap.put(EntityTypes.RABBIT, EntityRabbit.class);
minecraftClassMap.put(EntityTypes.SALMON, EntitySalmon.class);
minecraftClassMap.put(EntityTypes.SHEEP, EntitySheep.class);
minecraftClassMap.put(EntityTypes.SHULKER, EntityShulker.class);
minecraftClassMap.put(EntityTypes.SHULKER_BULLET, EntityShulkerBullet.class);
minecraftClassMap.put(EntityTypes.SILVERFISH, EntitySilverfish.class);
minecraftClassMap.put(EntityTypes.SKELETON, EntitySkeleton.class);
minecraftClassMap.put(EntityTypes.SKELETON_HORSE, EntityHorseSkeleton.class);
minecraftClassMap.put(EntityTypes.SLIME, EntitySlime.class);
minecraftClassMap.put(EntityTypes.SMALL_FIREBALL, EntitySmallFireball.class);
minecraftClassMap.put(EntityTypes.SNOW_GOLEM, EntitySnowman.class);
minecraftClassMap.put(EntityTypes.SNOWBALL, EntitySnowball.class);
minecraftClassMap.put(EntityTypes.SPECTRAL_ARROW, EntitySpectralArrow.class);
minecraftClassMap.put(EntityTypes.SPIDER, EntitySpider.class);
minecraftClassMap.put(EntityTypes.SQUID, EntitySquid.class);
minecraftClassMap.put(EntityTypes.STRAY, EntitySkeletonStray.class);
minecraftClassMap.put(EntityTypes.TROPICAL_FISH, EntityTropicalFish.class);
minecraftClassMap.put(EntityTypes.TURTLE, EntityTurtle.class);
minecraftClassMap.put(EntityTypes.EGG, EntityEgg.class);
minecraftClassMap.put(EntityTypes.ENDER_PEARL, EntityEnderPearl.class);
minecraftClassMap.put(EntityTypes.EXPERIENCE_BOTTLE, EntityThrownExpBottle.class);
minecraftClassMap.put(EntityTypes.POTION, EntityPotion.class);
minecraftClassMap.put(EntityTypes.TRIDENT, EntityThrownTrident.class);
minecraftClassMap.put(EntityTypes.VEX, EntityVex.class);
minecraftClassMap.put(EntityTypes.VILLAGER, EntityVillager.class);
minecraftClassMap.put(EntityTypes.IRON_GOLEM, EntityIronGolem.class);
minecraftClassMap.put(EntityTypes.VINDICATOR, EntityVindicator.class);
minecraftClassMap.put(EntityTypes.PILLAGER, EntityPillager.class);
minecraftClassMap.put(EntityTypes.WANDERING_TRADER, EntityVillagerTrader.class);
minecraftClassMap.put(EntityTypes.WITCH, EntityWitch.class);
minecraftClassMap.put(EntityTypes.WITHER, EntityWither.class);
minecraftClassMap.put(EntityTypes.WITHER_SKELETON, EntitySkeletonWither.class);
minecraftClassMap.put(EntityTypes.WITHER_SKULL, EntityWitherSkull.class);
minecraftClassMap.put(EntityTypes.WOLF, EntityWolf.class);
minecraftClassMap.put(EntityTypes.ZOMBIE, EntityZombie.class);
minecraftClassMap.put(EntityTypes.ZOMBIE_HORSE, EntityHorseZombie.class);
minecraftClassMap.put(EntityTypes.ZOMBIE_VILLAGER, EntityZombieVillager.class);
minecraftClassMap.put(EntityTypes.PHANTOM, EntityPhantom.class);
minecraftClassMap.put(EntityTypes.RAVAGER, EntityRavager.class);
minecraftClassMap.put(EntityTypes.FISHING_BOBBER, EntityFishingHook.class);
}
}
46 changes: 46 additions & 0 deletions src/main/java/eu/phiwa/dragontravel/nms/v1_14_R1/EntityRegister.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package eu.phiwa.dragontravel.nms.v1_14_R1;

import eu.phiwa.dragontravel.core.DragonTravel;
import eu.phiwa.dragontravel.core.hooks.server.IEntityRegister;
import net.minecraft.server.v1_14_R1.EntityTypes;
import net.minecraft.server.v1_14_R1.MinecraftKey;
import org.bukkit.Bukkit;
import org.bukkit.entity.Entity;

public class EntityRegister implements IEntityRegister {
private static CustomEntityRegistry ENTITY_REGISTRY;

/*
SOURCE :
https://github.com/CitizensDev/Citizens2/blob/master/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
*/
public void registerEntityClass(Class<?> clazz) {
if (ENTITY_REGISTRY == null)
return;

Class<?> search = clazz;
while ((search = search.getSuperclass()) != null && Entity.class.isAssignableFrom(search)) {
EntityTypes<?> type = ENTITY_REGISTRY.findType(search);
MinecraftKey key = ENTITY_REGISTRY.getKey(type);
if (key == null || type == null)
continue;
int code = ENTITY_REGISTRY.a(type);
ENTITY_REGISTRY.put(code, key, type);
return;
}
throw new IllegalArgumentException("unable to find valid entity superclass for class " + clazz.toString());
}

@Override
public boolean registerEntity() {
try {
registerEntityClass( RyeDragon.class );
return true;
} catch (Exception e) {
Bukkit.getLogger().info("[DragonTravel] [Error] Could not register the RyeDragon-entity!");
e.printStackTrace();
Bukkit.getPluginManager().disablePlugin(DragonTravel.getInstance());
}
return false;
}
}
Loading

0 comments on commit 32d2d16

Please sign in to comment.