Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-09-27 14:53:09 +02:00
Code Issues Projects Releases Wiki Activity

Forward more registry methods

Browse Source
This commit is contained in:
fullwall 2022-12-09 19:23:41 +08:00
parent 139158cb48
commit 27d7b2dee3
4 changed files with 167 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/CustomEntityRegistry.java
View File

@ -44,6 +44,21 @@ public class CustomEntityRegistry extends RegistryBlocks {
return wrapped.a(paramRandom);
}
@Override
public Object a(ResourceKey key) {
return wrapped.a(key);
}
@Override
public Optional c(Object key) {
return wrapped.c((EntityTypes<?>) key);
}
@Override
public Object d(ResourceKey key) {
return wrapped.d(key);
}
public EntityTypes findType(Class<?> search) {
return minecraftClassMap.inverse().get(search);
/*

35
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/CustomEntityRegistry.java
View File

@ -152,6 +152,21 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return this.wrapped.byId(var0);
}
@Override
public boolean containsKey(ResourceKey var0) {
return this.wrapped.containsKey(var0);
}
@Override
public boolean containsKey(ResourceLocation var0) {
return this.wrapped.containsKey(var0);
}
@Override
public Set<Object> entrySet() {
return (Set) wrapped.entrySet();
}
public EntityType findType(Class<?> search) {
return minecraftClassMap.inverse().get(search);
/*
@ -164,6 +179,11 @@ public class CustomEntityRegistry extends DefaultedRegistry {
*/
}
@Override
public EntityType get(ResourceKey key) {
return wrapped.get(key);
}
@Override
public EntityType get(ResourceLocation key) {
if (entities.containsKey(key)) {
@ -191,6 +211,11 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return wrapped.getKey((EntityType) value);
}
@Override
public Optional getOptional(ResourceKey var0) {
return this.wrapped.getOptional(var0);
}
@Override
public Optional getOptional(ResourceLocation var0) {
if (entities.containsKey(var0)) {
@ -200,11 +225,21 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return this.wrapped.getOptional(var0);
}
@Override
public EntityType getOrThrow(ResourceKey key) {
return wrapped.getOrThrow(key);
}
@Override
public Object getRandom(Random paramRandom) {
return wrapped.getRandom(paramRandom);
}
@Override
public Optional getResourceKey(Object var0) {
return wrapped.getResourceKey((EntityType<?>) var0);
}
public MappedRegistry<EntityType<?>> getWrapped() {
return wrapped;
}

56
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/CustomEntityRegistry.java
View File

@ -19,6 +19,7 @@ import net.minecraft.core.MappedRegistry;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.entity.AreaEffectCloud;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.ExperienceOrb;
@ -154,6 +155,26 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return this.wrapped.byId(var0);
}
@Override
public Object byIdOrThrow(int var0) {
return this.wrapped.byIdOrThrow(var0);
}
@Override
public boolean containsKey(ResourceKey var0) {
return this.wrapped.containsKey(var0);
}
@Override
public boolean containsKey(ResourceLocation var0) {
return this.wrapped.containsKey(var0);
}
@Override
public Set<Object> entrySet() {
return (Set) wrapped.entrySet();
}
public EntityType findType(Class<?> search) {
return minecraftClassMap.inverse().get(search);
/*
@ -166,6 +187,11 @@ public class CustomEntityRegistry extends DefaultedRegistry {
*/
}
@Override
public EntityType get(ResourceKey key) {
return wrapped.get(key);
}
@Override
public EntityType get(ResourceLocation key) {
if (entities.containsKey(key)) {
@ -175,6 +201,16 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return wrapped.get(key);
}
@Override
public Optional getHolder(int var0) {
return this.wrapped.getHolder(var0);
}
@Override
public Optional getHolder(ResourceKey var0) {
return this.wrapped.getHolder(var0);
}
@Override
public int getId(Object key) {
if (entityIds.containsKey(key)) {
@ -193,6 +229,11 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return wrapped.getKey((EntityType) value);
}
@Override
public Optional getOptional(ResourceKey var0) {
return this.wrapped.getOptional(var0);
}
@Override
public Optional getOptional(ResourceLocation var0) {
if (entities.containsKey(var0)) {
@ -202,11 +243,26 @@ public class CustomEntityRegistry extends DefaultedRegistry {
return this.wrapped.getOptional(var0);
}
@Override
public EntityType getOrThrow(ResourceKey key) {
return wrapped.getOrThrow(key);
}
@Override
public Optional getRandom(Random paramRandom) {
return wrapped.getRandom(paramRandom);
}
@Override
public Optional getResourceKey(Object var0) {
return wrapped.getResourceKey((EntityType<?>) var0);
}
@Override
public Optional getTag(TagKey var0) {
return this.wrapped.getTag(var0);
}
public MappedRegistry<EntityType<?>> getWrapped() {
return wrapped;
}

61
v1_19_R2/src/main/java/net/citizensnpcs/nms/v1_19_R2/util/CustomEntityRegistry.java
View File

@ -18,6 +18,7 @@ import net.minecraft.core.MappedRegistry;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.AreaEffectCloud;
import net.minecraft.world.entity.EntityType;
@ -158,6 +159,26 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
return this.wrapped.byId(var0);
}
@Override
public Object byIdOrThrow(int var0) {
return this.wrapped.byIdOrThrow(var0);
}
@Override
public boolean containsKey(ResourceKey var0) {
return this.wrapped.containsKey(var0);
}
@Override
public boolean containsKey(ResourceLocation var0) {
return this.wrapped.containsKey(var0);
}
@Override
public Set<Object> entrySet() {
return (Set) wrapped.entrySet();
}
public EntityType findType(Class<?> search) {
return minecraftClassMap.inverse().get(search);
/*
@ -170,6 +191,11 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
*/
}
@Override
public EntityType get(ResourceKey key) {
return wrapped.get(key);
}
@Override
public EntityType get(ResourceLocation key) {
if (entities.containsKey(key)) {
@ -179,6 +205,16 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
return wrapped.get(key);
}
@Override
public Optional getHolder(int var0) {
return this.wrapped.getHolder(var0);
}
@Override
public Optional getHolder(ResourceKey var0) {
return this.wrapped.getHolder(var0);
}
@Override
public int getId(Object key) {
if (entityIds.containsKey(key)) {
@ -197,6 +233,11 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
return wrapped.getKey((EntityType) value);
}
@Override
public Optional getOptional(ResourceKey var0) {
return this.wrapped.getOptional(var0);
}
@Override
public Optional getOptional(ResourceLocation var0) {
if (entities.containsKey(var0)) {
@ -206,11 +247,26 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
return this.wrapped.getOptional(var0);
}
@Override
public EntityType getOrThrow(ResourceKey key) {
return wrapped.getOrThrow(key);
}
@Override
public Optional getRandom(RandomSource paramRandom) {
return wrapped.getRandom(paramRandom);
}
@Override
public Optional getResourceKey(Object var0) {
return wrapped.getResourceKey((EntityType<?>) var0);
}
@Override
public Optional getTag(TagKey var0) {
return this.wrapped.getTag(var0);
}
public MappedRegistry<EntityType<?>> getWrapped() {
return wrapped;
}
@ -230,6 +286,11 @@ public class CustomEntityRegistry extends DefaultedMappedRegistry {
entityIds.put(entityClass, entityId);
}
@Override
public Set<Object> registryKeySet() {
return (Set) wrapped.registryKeySet();
}
private static final MethodHandle IREGISTRY_HOLDER_PROVDER = NMS.getGetter(MappedRegistry.class, "m");
private static final MethodHandle IREGISTRY_LIFECYCLE = NMS.getFirstGetter(MappedRegistry.class, Lifecycle.class);
// replace regex .*?> ([A-Z_]+).*?of\((.*?)::new.*?$ minecraftClassMap.put(EntityType.\1, \2.class);