tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes #2724: Use capitalized oredict name for dyes, not uppercase.

Browse source
This commit is contained in:
yueh 2016-12-29 15:50:02 +01:00
parent 589730bfad
commit 2ab0528015
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/main/java/appeng/coremod/asm/ASMIntegration.java → src/main/java/appeng/coremod/transformer/IntegrationTransformer.java
View file

17
src/main/java/appeng/items/tools/powered/ToolColorApplicator.java
View file

@ -27,6 +27,8 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import org.apache.commons.lang3.text.WordUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockColored; import net.minecraft.block.BlockColored;
import net.minecraft.block.BlockStainedGlass; import net.minecraft.block.BlockStainedGlass;
@ -86,15 +88,13 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
static static
{ {
for( final AEColor color : AEColor.VALID_COLORS )
for( final AEColor col : AEColor.values() )
{ {
if( col == AEColor.TRANSPARENT ) final String dyeName = color.dye.getUnlocalizedName();
{ final String oreDictName = "dye" + WordUtils.capitalize( dyeName );
continue; final int oreDictId = OreDictionary.getOreID( oreDictName );
}
ORE_TO_COLOR.put( OreDictionary.getOreID( "dye" + col.name() ), col ); ORE_TO_COLOR.put( oreDictId, color );
} }
} }
@ -277,7 +277,8 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
list.add( i ); list.add( i );
} }
Collections.sort( list, new Comparator<IAEItemStack>(){ Collections.sort( list, new Comparator<IAEItemStack>()
{
@Override @Override
public int compare( final IAEItemStack a, final IAEItemStack b ) public int compare( final IAEItemStack a, final IAEItemStack b )