Fix randomization and FilteredTextureUtil with CFI

This commit is contained in:
Jesse Boyd 2017-09-09 00:35:29 +10:00
parent f2b592a9e1
commit b4c3e3989c
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 8 additions and 1 deletions

View File

@ -252,7 +252,12 @@ public class CreateFromImage extends Command {
// roughness // roughness
// blocks // blocks
if (argList.size() != 2) { if (argList.size() != 2) {
C.COMMAND_SYNTAX.send(player, "/2 cfi " + argList.get(0) + " <pattern|#clipboard>"); C.COMMAND_SYNTAX.send(player, "/2 cfi " + argList.get(0) + " <pattern|#clipboard|*>");
return;
}
if (argList.get(1).equalsIgnoreCase("*")) {
generator.setTextureUtil(Fawe.get().getTextureUtil());
player.sendMessage("Set color palette blocks, what's next?");
return; return;
} }
context.setPreferringWildcard(true); context.setPreferringWildcard(true);

View File

@ -8,6 +8,8 @@ import java.util.Set;
public class FilteredTextureUtil extends TextureUtil { public class FilteredTextureUtil extends TextureUtil {
public FilteredTextureUtil(TextureUtil parent, Set<BaseBlock> blocks) throws FileNotFoundException { public FilteredTextureUtil(TextureUtil parent, Set<BaseBlock> blocks) throws FileNotFoundException {
super(parent.getFolder()); super(parent.getFolder());
this.validMixBiomeColors = parent.validMixBiomeColors;
this.validMixBiomeIds = parent.validMixBiomeIds;
this.validBiomes = parent.validBiomes; this.validBiomes = parent.validBiomes;
this.blockColors = parent.blockColors; this.blockColors = parent.blockColors;
this.blockDistance = parent.blockDistance; this.blockDistance = parent.blockDistance;