Fix problem in EnumFlowerColor with "getName", which conflicts during obfuscation.

This commit is contained in:
marcin212 committed 2017-06-03 18:11:05 +02:00
1 parent b59f541a10
commit 05648ce05a
23 files changed
+171 -133

No files matched your search

@@ -24,8 +24,10 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
public class WindowBotanistDatabase extends WindowAbstractDatabase {
ControlListBox<EnumFlowerColor> selectionBoxColors;
@@ -87,8 +89,7 @@ public class WindowBotanistDatabase extends WindowAbstractDatabase {
return new ControlColourOption(this.getContent(), value, y);
}
};
final List<IFlowerColour> colors = new ArrayList<>();
Collections.addAll(colors, EnumFlowerColor.values());
final List<IFlowerColour> colors = Arrays.stream(EnumFlowerColor.values()).map( c -> c.getFlowerColorAllele()).collect(Collectors.toList());
this.listBox.setOptions(colors);
}
}