Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-05 10:20:11 +01:00
Code Issues Projects Releases Wiki Activity

Fix missing piglin brute type

Browse Source
This commit is contained in:
fullwall 2020-09-03 00:08:23 +08:00
parent 0c7dd3b4f0
commit 109beda4c5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v1_16_R2/src/main/java/net/citizensnpcs/nms/v1_16_R2/util/CustomEntityRegistry.java
View File

@ -24,7 +24,8 @@ public class CustomEntityRegistry extends RegistryBlocks {
@SuppressWarnings("unchecked")
public CustomEntityRegistry(RegistryBlocks<EntityTypes<?>> original) throws Throwable {
super(original.a().getNamespace(), (ResourceKey<IRegistry<EntityTypes<?>>>) IREGISTRY_RESOURCE_KEY.invoke(original),
super(original.a().getNamespace(),
(ResourceKey<IRegistry<EntityTypes<?>>>) IREGISTRY_RESOURCE_KEY.invoke(original),
(Lifecycle) IREGISTRY_LIFECYCLE.invoke(original));
this.wrapped = original;
}
@ -106,11 +107,11 @@ public class CustomEntityRegistry extends RegistryBlocks {
entityIds.put(entityClass, entityId);
}
private static final MethodHandle IREGISTRY_LIFECYCLE = NMS.getGetter(IRegistry.class, "bf");
// replace regex
// ([A-Z_]+).*?a\(E(.*?)::new.*?$
// minecraftClassMap.put(EntityTypes.\1, E\2.class);
private static final MethodHandle IREGISTRY_RESOURCE_KEY = NMS.getGetter(IRegistry.class, "b");
private static final MethodHandle IREGISTRY_LIFECYCLE = NMS.getGetter(IRegistry.class, "bf");
private static final BiMap<EntityTypes, Class<?>> minecraftClassMap = HashBiMap.create();
static {
minecraftClassMap.put(EntityTypes.AREA_EFFECT_CLOUD, EntityAreaEffectCloud.class);
@ -174,6 +175,7 @@ public class CustomEntityRegistry extends RegistryBlocks {
minecraftClassMap.put(EntityTypes.PHANTOM, EntityPhantom.class);
minecraftClassMap.put(EntityTypes.PIG, EntityPig.class);
minecraftClassMap.put(EntityTypes.PIGLIN, EntityPiglin.class);
minecraftClassMap.put(EntityTypes.PIGLIN_BRUTE, EntityPiglinBrute.class);
minecraftClassMap.put(EntityTypes.PILLAGER, EntityPillager.class);
minecraftClassMap.put(EntityTypes.POLAR_BEAR, EntityPolarBear.class);
minecraftClassMap.put(EntityTypes.TNT, EntityTNTPrimed.class);