fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Second update pass (2/3) - 82 -> 0 errors

Browse Source 
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
This commit is contained in:
elix-x
2016-06-21 11:03:10 +02:00
parent 5498eb6d7c
commit 05aa6972c4
83 changed files with 564 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/FacadeConfig.java
+5 -5
View File
@@ -25,8 +25,9 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fml.common.registry.GameRegistry;
public class FacadeConfig extends Configuration
@@ -48,8 +49,7 @@ public class FacadeConfig extends Configuration
return false;
}
//TODO 1.9.4 - UniqueIdentifier => ResourceLocation ???
final UniqueIdentifier blk = GameRegistry.findUniqueIdentifierFor( id );
final ResourceLocation blk = Item.REGISTRY.getNameForObject( Item.getItemFromBlock( id ) );
if( blk == null )
{
for( final Field f : Block.class.getFields() )
@@ -69,8 +69,8 @@ public class FacadeConfig extends Configuration
}
else
{
final Matcher mod = this.replacementPattern.matcher( blk.modId );
final Matcher name = this.replacementPattern.matcher( blk.name );
final Matcher mod = this.replacementPattern.matcher( blk.getResourceDomain() );
final Matcher name = this.replacementPattern.matcher( blk.getResourcePath() );
return this.get( mod.replaceAll( "" ), name.replaceAll( "" ) + ( metadata == 0 ? "" : "." + metadata ), automatic ).getBoolean( automatic );
}