Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-02-02 05:21:47 +01:00
Code Issues Projects Releases Wiki Activity

Remove some generics which may be confusing jenkins

Browse Source
This commit is contained in:
fullwall 2016-11-22 01:09:11 +08:00
parent e03ad190ba
commit cb3c32a101
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/CustomEntityRegistry.java
View File

@ -10,7 +10,7 @@ import net.minecraft.server.v1_11_R1.Entity;
import net.minecraft.server.v1_11_R1.MinecraftKey; import net.minecraft.server.v1_11_R1.MinecraftKey;
import net.minecraft.server.v1_11_R1.RegistryMaterials; import net.minecraft.server.v1_11_R1.RegistryMaterials;
public class CustomEntityRegistry extends RegistryMaterials<MinecraftKey, Class<? extends Entity>> { public class CustomEntityRegistry extends RegistryMaterials {
private final BiMap<MinecraftKey, Class<? extends Entity>> entities = HashBiMap.create(); private final BiMap<MinecraftKey, Class<? extends Entity>> entities = HashBiMap.create();
private final BiMap<Class<? extends Entity>, MinecraftKey> entityClasses = this.entities.inverse(); private final BiMap<Class<? extends Entity>, MinecraftKey> entityClasses = this.entities.inverse();
private final Map<Class<? extends Entity>, Integer> entityIds = Maps.newHashMap(); private final Map<Class<? extends Entity>, Integer> entityIds = Maps.newHashMap();
@ -21,30 +21,30 @@ public class CustomEntityRegistry extends RegistryMaterials<MinecraftKey, Class<
} }
@Override @Override
public int a(Class<? extends Entity> key) { public int a(Object key) {
if (this.entityIds.containsKey(key)) { if (this.entityIds.containsKey(key)) {
return this.entityIds.get(key); return this.entityIds.get(key);
} }
return this.wrapped.a(key); return this.wrapped.a((Class<? extends Entity>) key);
} }
@Override @Override
public MinecraftKey b(Class<? extends Entity> value) { public MinecraftKey b(Object value) {
if (entityClasses.containsKey(value)) { if (entityClasses.containsKey(value)) {
return entityClasses.get(value); return entityClasses.get(value);
} }
return wrapped.b(value); return wrapped.b((Class<? extends Entity>) value);
} }
@Override @Override
public Class<? extends Entity> get(MinecraftKey key) { public Class<? extends Entity> get(Object key) {
if (entities.containsKey(key)) { if (entities.containsKey(key)) {
return entities.get(key); return entities.get(key);
} }
return wrapped.get(key); return wrapped.get((MinecraftKey) key);
} }
public RegistryMaterials<MinecraftKey, Class<? extends Entity>> getWrapped() { public RegistryMaterials<MinecraftKey, Class<? extends Entity>> getWrapped() {
@ -52,7 +52,7 @@ public class CustomEntityRegistry extends RegistryMaterials<MinecraftKey, Class<
} }
public void put(int entityId, MinecraftKey key, Class<? extends Entity> entityClass) { public void put(int entityId, MinecraftKey key, Class<? extends Entity> entityClass) {
this.entities.put(key, entityClass); entities.put(key, entityClass);
this.entityIds.put(entityClass, entityId); entityIds.put(entityClass, entityId);
} }
} }