Skip to content

Commit 57e9dd2

Browse files
committed
feat: update to latest kubejs changes
1 parent 33ae29c commit 57e9dd2

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ mod_authors=Kli Kli
3939
mod_description=KubeJS Plugin for Occultism
4040

4141
## Dependency Properties
42-
kubejs_version=2101.7.0-build.158
42+
kubejs_version=2101.7.0-build.163
4343
kubejs_version_range=[2100.7.0-build.33,)
4444

4545
occultism_version=1.153.2

src/main/java/com/klikli_dev/occultism_kubejs/RitualDummyItemType.java

+17-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
package com.klikli_dev.occultism_kubejs;
2424

25-
import com.google.gson.JsonObject;
2625
import com.klikli_dev.occultism.common.item.DummyTooltipItem;
2726
import dev.latvian.mods.kubejs.client.LangKubeEvent;
27+
import dev.latvian.mods.kubejs.generator.KubeAssetGenerator;
2828
import dev.latvian.mods.kubejs.item.ItemBuilder;
2929
import dev.latvian.mods.kubejs.typings.Info;
3030
import net.minecraft.network.chat.Component;
@@ -42,16 +42,29 @@ public RitualDummyItemType(ResourceLocation rl) {
4242

4343
//make the item just use the ritual dummy parent mode
4444
//Note: we are not using this.parentModel() because it causes textures to be overwritten with a texture location corresponding to the item id unless the correct one is manually specified again
45-
var modelJson = new JsonObject();
46-
modelJson.addProperty("parent", "occultism:item/ritual_dummy");
47-
this.modelJson(modelJson);
45+
//Note: We now use parentModel because this.itemModel is gone, instead we fix the texture issue in generateAssets
46+
this.parentModel(ResourceLocation.parse("occultism:item/ritual_dummy"));
4847
}
4948

5049
@Override
5150
public Item createObject() {
5251
return new DummyTooltipItem(this.createItemProperties());
5352
}
5453

54+
@Override
55+
public void generateAssets(KubeAssetGenerator generator) {
56+
//Copied from super, but without the textures
57+
generator.itemModel(this.id, m -> {
58+
m.parent(this.parentModel != null ? this.parentModel : KubeAssetGenerator.GENERATED_ITEM_MODEL);
59+
// if (textures.isEmpty()) {
60+
// texture(id.withPath(ID.ITEM).toString());
61+
// }
62+
63+
// m.textures(textures);
64+
});
65+
}
66+
67+
5568
@Override
5669
public void generateLang(LangKubeEvent lang) {
5770
super.generateLang(lang);

0 commit comments

Comments
 (0)