Renamed BuilderBase#generateDataJsons to generateData and generateAss…

…etJsons to generateAssets. Sorry plugin devs, forgot to do that sooner
KubeJS-Mods · Jul 24, 2024 · 18c3772 · 18c3772
1 parent b05461f
commit 18c3772
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/BlockBuilder.java
@@ -180,7 +180,7 @@ public BuilderBase<Block> displayName(Component name) {
 	}
 
 	@Override
-	public void generateDataJsons(KubeDataGenerator generator) {
+	public void generateData(KubeDataGenerator generator) {
 		var table = generateLootTable();
 
 		if (table != null) {
@@ -226,7 +226,7 @@ public LootTable generateLootTable() {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 		if (blockstateJson != null) {
 			generator.json(newID("blockstates/", ""), blockstateJson);
 		} else {

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/BlockItemBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/BlockItemBuilder.java
@@ -24,6 +24,6 @@ public String getTranslationKeyGroup() {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 	}
 }
diff --git a/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java b/src/main/java/dev/latvian/mods/kubejs/block/DetectorBlock.java
@@ -46,7 +46,7 @@ public Block createObject() {
 		}
 
 		@Override
-		public void generateAssetJsons(KubeAssetGenerator generator) {
+		public void generateAssets(KubeAssetGenerator generator) {
 			generator.blockState(id, bs -> {
 				bs.simpleVariant("powered=false", "kubejs:block/detector");
 				bs.simpleVariant("powered=true", "kubejs:block/detector_on");

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/SeedItemBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/SeedItemBuilder.java
@@ -51,7 +51,7 @@ public Item createObject() {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 		if (modelJson != null) {
 			generator.json(KubeAssetGenerator.asItemModelLocation(id), modelJson);
 			return;

diff --git a/src/main/java/dev/latvian/mods/kubejs/block/custom/MultipartShapedBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/block/custom/MultipartShapedBlockBuilder.java
@@ -10,7 +10,7 @@ public MultipartShapedBlockBuilder(ResourceLocation i, String... suffixes) {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 		if (blockstateJson != null) {
 			generator.json(newID("blockstates/", ""), blockstateJson);
 		} else {

diff --git a/src/main/java/dev/latvian/mods/kubejs/client/ClientAssetPacks.java b/src/main/java/dev/latvian/mods/kubejs/client/ClientAssetPacks.java
@@ -56,7 +56,7 @@ public List<PackResources> inject(List<PackResources> original) {
 		internalAssetPack.reset();
 
 		for (var builder : RegistryObjectStorage.ALL_BUILDERS) {
-			builder.generateAssetJsons(internalAssetPack);
+			builder.generateAssets(internalAssetPack);
 		}
 
 		KubeJSPlugins.forEachPlugin(internalAssetPack, KubeJSPlugin::generateAssets);

diff --git a/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java b/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBlockBuilder.java
@@ -29,7 +29,7 @@ public Block createObject() {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 		generator.blockState(id, m -> m.simpleVariant("", id.getNamespace() + ":block/" + id.getPath()));
 		generator.blockModel(id, m -> {
 			m.parent("");

diff --git a/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBucketItemBuilder.java b/src/main/java/dev/latvian/mods/kubejs/fluid/FluidBucketItemBuilder.java
@@ -20,7 +20,7 @@ public BucketItem createObject() {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 		if (modelJson != null) {
 			generator.json(KubeAssetGenerator.asItemModelLocation(id), modelJson);
 			return;

diff --git a/src/main/java/dev/latvian/mods/kubejs/item/ItemBuilder.java b/src/main/java/dev/latvian/mods/kubejs/item/ItemBuilder.java
@@ -118,7 +118,7 @@ public Item transformObject(Item obj) {
 	}
 
 	@Override
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 		if (modelJson != null) {
 			generator.json(KubeAssetGenerator.asItemModelLocation(id), modelJson);
 			return;
@@ -131,7 +131,7 @@ public void generateAssetJsons(KubeAssetGenerator generator) {
 				m.parent("minecraft:item/generated");
 			}
 
-			if (textureJson.size() == 0) {
+			if (textureJson.isEmpty()) {
 				texture(newID("item/", "").toString());
 			}
 

diff --git a/src/main/java/dev/latvian/mods/kubejs/registry/BuilderBase.java b/src/main/java/dev/latvian/mods/kubejs/registry/BuilderBase.java
@@ -127,11 +127,11 @@ public ResourceLocation newID(String pre, String post) {
 	}
 
 	@HideFromJS
-	public void generateDataJsons(KubeDataGenerator generator) {
+	public void generateData(KubeDataGenerator generator) {
 	}
 
 	@HideFromJS
-	public void generateAssetJsons(KubeAssetGenerator generator) {
+	public void generateAssets(KubeAssetGenerator generator) {
 	}
 
 	public String getBuilderTranslationKey() {

diff --git a/src/main/java/dev/latvian/mods/kubejs/server/ServerScriptManager.java b/src/main/java/dev/latvian/mods/kubejs/server/ServerScriptManager.java
@@ -137,7 +137,7 @@ public <T> void add(ResourceKey<Registry<T>> registry, BuilderBase<? extends T>
 	@Override
 	public void loadAdditional() {
 		for (var builder : RegistryObjectStorage.ALL_BUILDERS) {
-			builder.generateDataJsons(internalDataPack);
+			builder.generateData(internalDataPack);
 		}
 
 		KubeJSPlugins.forEachPlugin(internalDataPack, KubeJSPlugin::generateData);