Avoid breaking addons by adding a deprecated copy of the original tha…

…t has @HideFromJS. Also fix KubeJS block builders to use the new name.
KubeJS-Mods · Jul 21, 2023 · 9f17a9f · 9f17a9f
1 parent a6adf19
commit 9f17a9f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 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
@@ -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<ResourceLocation, JsonObject> 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
@@ -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
@@ -201,7 +201,7 @@ public BlockBuilder randomTick(@Nullable Consumer<RandomTickCallbackJS> 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
@@ -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<Variant> 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
@@ -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());