keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix AbstractMethodException in FML Registries. Closes #3427

Browse source
This commit is contained in:
LexManos 2016-11-20 16:15:15 -08:00
parent b039e2172b
commit 8f03658f1f
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -374,6 +374,12 @@ String getVersionFromJava(File file)
return out; return out;
} }
reobfuscate {
extraSrg = [
'MD: net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry/getKeys ()Ljava/util/Set; net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry/getKeys ()Ljava/util/Set;'
]
}
task resetBuildNumber << { task resetBuildNumber << {
project.ext.properties.buildNumber = 0; project.ext.properties.buildNumber = 0;
ciWriteBuildNumber.execute() ciWriteBuildNumber.execute()

6
src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
View file

@ -854,6 +854,12 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> e
return getNameForObject(value); return getNameForObject(value);
} }
@Override //Bouncer for OBF, as the super class's function is NotchCode and gets obfed. This plus the SRG lines prevents a AbstractMethodException
public Set<ResourceLocation> getKeys()
{
return super.getKeys();
}
@Override @Override
public List<I> getValues() public List<I> getValues()
{ {

1
src/main/resources/forge.srg
View file

@ -1 +1,2 @@
MD: net/minecraft/server/management/ServerConfigurationManager/initializeConnectionToPlayer (Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V net/minecraft/server/management/ServerConfigurationManager/func_72355_a (Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V MD: net/minecraft/server/management/ServerConfigurationManager/initializeConnectionToPlayer (Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V net/minecraft/server/management/ServerConfigurationManager/func_72355_a (Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V
MD: net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry/getKeys ()Ljava/util/Set; net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry/getKeys ()Ljava/util/Set;