Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix TextureUtil mushroom coloring

This commit is contained in:
Jesse Boyd 2018-04-22 07:35:34 +10:00
parent 668f6c6e34
commit 13b5ded4e9
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
core/src/main/java/com/boydti/fawe/util/TextureUtil.java
View File

@ -14,24 +14,13 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArraySet; import it.unimi.dsi.fastutil.ints.IntArraySet;
import it.unimi.dsi.fastutil.longs.LongArrayList; import it.unimi.dsi.fastutil.longs.LongArrayList;
import java.awt.Color;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.File; import java.io.*;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
@ -627,7 +616,12 @@ public class TextureUtil {
combined += 8; combined += 8;
break; break;
} }
idMap.put(combined, texture); idMap.putIfAbsent(combined, texture);
}
if (block.getId() == 100) {
System.out.println(100 + "Texture " + texture + " | " + id + " | " + block);
} }
} }
} }
@ -949,7 +943,11 @@ public class TextureUtil {
names.add(name.replaceAll("leaves_", "leaves2_")); names.add(name.replaceAll("leaves_", "leaves2_"));
break; break;
case "mushroom": case "mushroom":
names.add(name.replaceAll("mushroom_block_skin_", "mushroom_block_")); if (name.contains("mushroom_block_skin_")) names.add(name.replaceAll("mushroom_block_skin_", "mushroom_block_"));
if (name.contains("_red")) name = "red_" + name.replaceAll("_red", "");
if (name.contains("_brown")) name = "brown_" + name.replaceAll("_brown", "");
if (!name.contains("stem")) name = name.replaceAll("skin", "all_outside");
names.add(name);
break; break;
case "half": case "half":
names.add(name.replaceAll("half_", "double_stone_")); names.add(name.replaceAll("half_", "double_stone_"));