From 7fa42ca064207f72162315268ff6200fab4b1616 Mon Sep 17 00:00:00 2001 From: Edwin Mindcraft Date: Fri, 15 May 2020 19:28:10 +0200 Subject: [PATCH] Use IProperty#getName when generating blockstate jsons (#6582) Close #6520 --- .../client/model/generators/MultiPartBlockStateBuilder.java | 4 ++-- .../client/model/generators/VariantBlockStateBuilder.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java index 4b65545590..49d7201177 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java +++ b/src/main/java/net/minecraftforge/client/model/generators/MultiPartBlockStateBuilder.java @@ -119,10 +119,10 @@ public final class MultiPartBlockStateBuilder implements IGeneratedBlockstate { JsonObject when = new JsonObject(); for (Entry, Collection>> e : conditions.asMap().entrySet()) { StringBuilder activeString = new StringBuilder(); - for (Object val : e.getValue()) { + for (Comparable val : e.getValue()) { if (activeString.length() > 0) activeString.append("|"); - activeString.append(val.toString()); + activeString.append(((IProperty) e.getKey()).getName(val)); } when.addProperty(e.getKey().getName(), activeString.toString()); } diff --git a/src/main/java/net/minecraftforge/client/model/generators/VariantBlockStateBuilder.java b/src/main/java/net/minecraftforge/client/model/generators/VariantBlockStateBuilder.java index 70507a35a2..c36067acfb 100644 --- a/src/main/java/net/minecraftforge/client/model/generators/VariantBlockStateBuilder.java +++ b/src/main/java/net/minecraftforge/client/model/generators/VariantBlockStateBuilder.java @@ -307,7 +307,7 @@ public class VariantBlockStateBuilder implements IGeneratedBlockstate { } ret.append(entry.getKey().getName()) .append('=') - .append(entry.getValue()); + .append(((IProperty) entry.getKey()).getName(entry.getValue())); } return ret.toString(); }