Update Patterns.java

This commit is contained in:
Aleksey 2020-11-27 16:40:03 +03:00
parent 70d4e0e11f
commit f2cf4c5c03

View file

@ -9,6 +9,8 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.google.common.collect.Maps;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.resource.ResourceManager; import net.minecraft.resource.ResourceManager;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -101,24 +103,16 @@ public class Patterns {
public static String createJson(Identifier patternId, String parent, String block) { public static String createJson(Identifier patternId, String parent, String block) {
ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager(); ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager();
try (InputStream input = resourceManager.getResource(patternId).getInputStream()) { try (InputStream input = resourceManager.getResource(patternId).getInputStream()) {
return new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)) return createJson(new InputStreamReader(input, StandardCharsets.UTF_8), parent, block);
.lines().collect(Collectors.joining())
.replace("%parent%", parent)
.replace("%block%", block);
} catch (Exception ex) { } catch (Exception ex) {
return null; return null;
} }
} }
public static String createJson(Identifier patternId, String texture) { public static String createJson(Identifier patternId, String texture) {
ResourceManager resourceManager = MinecraftClient.getInstance().getResourceManager(); Map<String, String> textures = Maps.newHashMap();
try (InputStream input = resourceManager.getResource(patternId).getInputStream()) { textures.put("%texture%", texture);
return new BufferedReader(new InputStreamReader(input, StandardCharsets.UTF_8)) return createJson(patternId, textures);
.lines().collect(Collectors.joining())
.replace("%texture%", texture);
} catch (Exception ex) {
return null;
}
} }
public static String createJson(Identifier patternId, Map<String, String> textures) { public static String createJson(Identifier patternId, Map<String, String> textures) {