icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source 
# Conflicts:
#	src/main/java/carpet/utils/WoolTool.java
This commit is contained in:
gnembon committed 2021-04-15 14:49:17 -03:00
2 parents 2612dff497 14263203c5
commit 0dd88cd1dc
8 files changed
+327 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/utils/WoolTool.java
+19
View File
@@ -21,6 +21,25 @@ import java.util.List;
public class WoolTool
{
private static final HashMap<MapColor,DyeColor> Material2Dye = new HashMap<>();
public static final HashMap<MapColor,String> Material2DyeName = new HashMap<MaterialColor, String>(){{
put(MaterialColor.WHITE, "w ");
put(MaterialColor.ORANGE, "#F9801D ");
put(MaterialColor.MAGENTA, "m ");
put(MaterialColor.LIGHT_BLUE, "t ");
put(MaterialColor.YELLOW, "y ");
put(MaterialColor.LAPIS, "l ");
put(MaterialColor.PINK, "#FFACCB ");
put(MaterialColor.GRAY, "f ");
put(MaterialColor.LIGHT_GRAY, "g ");
put(MaterialColor.CYAN, "c ");
put(MaterialColor.PURPLE, "p ");
put(MaterialColor.BLUE, "v ");
put(MaterialColor.BROWN, "#835432 ");
put(MaterialColor.GREEN, "e ");
put(MaterialColor.RED, "r ");
put(MaterialColor.BLACK, "k ");
}};
static
{
for (DyeColor color: DyeColor.values())