Fixes #2724: Use capitalized oredict name for dyes, not uppercase.
This commit is contained in:
parent
589730bfad
commit
2ab0528015
|
@ -27,6 +27,8 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.apache.commons.lang3.text.WordUtils;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockColored;
|
||||
import net.minecraft.block.BlockStainedGlass;
|
||||
|
@ -86,15 +88,13 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
|
|||
|
||||
static
|
||||
{
|
||||
|
||||
for( final AEColor col : AEColor.values() )
|
||||
for( final AEColor color : AEColor.VALID_COLORS )
|
||||
{
|
||||
if( col == AEColor.TRANSPARENT )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
final String dyeName = color.dye.getUnlocalizedName();
|
||||
final String oreDictName = "dye" + WordUtils.capitalize( dyeName );
|
||||
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 );
|
||||
}
|
||||
|
||||
Collections.sort( list, new Comparator<IAEItemStack>(){
|
||||
Collections.sort( list, new Comparator<IAEItemStack>()
|
||||
{
|
||||
|
||||
@Override
|
||||
public int compare( final IAEItemStack a, final IAEItemStack b )
|
||||
|
|
Loading…
Reference in New Issue