From a6adf197cfb574eae326d41fd03d347c0d72599f Mon Sep 17 00:00:00 2001 From: ChiefArug <73862885+ChiefArug@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:35:12 +1200 Subject: [PATCH 1/2] Rename variant(String key, String model) to simpleVariant(String key, String model) in VariantBlockStateGenerator. Fixes #563 --- .../latvian/mods/kubejs/client/VariantBlockStateGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java b/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java index 309c0a646..654376b35 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java @@ -90,7 +90,7 @@ public void variant(String key, Consumer consumer) { variants.add(v.key, v.toJson()); } - public void variant(String key, String model) { + public void simpleVariant(String key, String model) { variant(key, v -> v.model(model)); } From 9f17a9f4faa967da4722df68e20066dfcce7c0b6 Mon Sep 17 00:00:00 2001 From: ChiefArug <73862885+ChiefArug@users.noreply.github.com> Date: Fri, 21 Jul 2023 20:57:37 +1200 Subject: [PATCH 2/2] Avoid breaking addons by adding a deprecated copy of the original that has @HideFromJS. Also fix KubeJS block builders to use the new name. --- .../java/dev/latvian/mods/kubejs/block/BlockBuilder.java | 2 +- .../java/dev/latvian/mods/kubejs/block/DetectorBlock.java | 4 ++-- .../latvian/mods/kubejs/block/custom/CropBlockBuilder.java | 2 +- .../mods/kubejs/client/VariantBlockStateGenerator.java | 7 +++++++ .../dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java b/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java index 5dce90f61..e22b32dad 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java @@ -235,7 +235,7 @@ protected void generateBlockModelJsons(AssetJsonGenerator generator) { } protected void generateBlockStateJson(VariantBlockStateGenerator bs) { - bs.variant("", model.isEmpty() ? (id.getNamespace() + ":block/" + id.getPath()) : model); + bs.simpleVariant("", model.isEmpty() ? (id.getNamespace() + ":block/" + id.getPath()) : model); } public Map generateBlockModels(BlockBuilder builder) { diff --git a/common/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java b/common/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java index a05b8535e..4e34c85a2 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java @@ -45,8 +45,8 @@ public Block createObject() { @Override public void generateAssetJsons(AssetJsonGenerator generator) { generator.blockState(id, bs -> { - bs.variant("powered=false", "kubejs:block/detector"); - bs.variant("powered=true", "kubejs:block/detector_on"); + bs.simpleVariant("powered=false", "kubejs:block/detector"); + bs.simpleVariant("powered=true", "kubejs:block/detector_on"); }); generator.itemModel(id, m -> m.parent(KubeJS.MOD_ID + ":block/detector")); diff --git a/common/src/main/java/dev/latvian/mods/kubejs/block/custom/CropBlockBuilder.java b/common/src/main/java/dev/latvian/mods/kubejs/block/custom/CropBlockBuilder.java index 4c3d074c3..a987958c1 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/block/custom/CropBlockBuilder.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/block/custom/CropBlockBuilder.java @@ -201,7 +201,7 @@ public BlockBuilder randomTick(@Nullable Consumer randomTi @Override protected void generateBlockStateJson(VariantBlockStateGenerator bs) { for (int i = 0; i <= age; i++) { - bs.variant("age=%s".formatted(i), model.isEmpty() ? (id.getNamespace() + ":block/" + id.getPath() + i) : model); + bs.simpleVariant("age=%s".formatted(i), model.isEmpty() ? (id.getNamespace() + ":block/" + id.getPath() + i) : model); } } diff --git a/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java b/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java index 654376b35..6db85ed88 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/client/VariantBlockStateGenerator.java @@ -3,6 +3,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import dev.latvian.mods.rhino.util.HideFromJS; import java.util.ArrayList; import java.util.List; @@ -90,6 +91,12 @@ public void variant(String key, Consumer consumer) { variants.add(v.key, v.toJson()); } + @HideFromJS + @Deprecated + public void variant(String key, String model) { + simpleVariant(key, model); + } + public void simpleVariant(String key, String model) { variant(key, v -> v.model(model)); } diff --git a/common/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java b/common/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java index fa69584be..414a538d0 100644 --- a/common/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java +++ b/common/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java @@ -29,7 +29,7 @@ public Block createObject() { @Override public void generateAssetJsons(AssetJsonGenerator generator) { - generator.blockState(id, m -> m.variant("", id.getNamespace() + ":block/" + id.getPath())); + generator.blockState(id, m -> m.simpleVariant("", id.getNamespace() + ":block/" + id.getPath())); generator.blockModel(id, m -> { m.parent(""); m.texture("particle", fluidBuilder.stillTexture.toString());