Generate multilayer items

This commit is contained in:
Vincent Lee committed 2020-07-19 17:58:21 -05:00
1 parent 8fd0534fe9
commit 4d50436f0e
23 files changed
+77 -45

No files matched your search

@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/blood_pendant",
"layer1": "botania:item/blood_pendant_overlay"
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/handheld",
"parent": "item/generated",
"textures": {
"layer0": "botania:item/ender_dagger",
"layer1": "botania:item/ender_dagger_overlay"
}
}
}
@@ -0,0 +1,7 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/incense_stick",
"layer1": "botania:item/incense_stick_overlay"
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_mirror",
"layer1": "botania:item/mana_mirror_overlay"
}
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_tablet",
"layer1": "botania:item/mana_tablet_overlay"
}
}
}
@@ -0,0 +1,8 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/third_eye_0",
"layer1": "botania:item/third_eye_1",
"layer2": "botania:item/third_eye_2"
}
}
@@ -51,9 +51,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
.collect(Collectors.toSet());
registerItemBlocks(takeAll(items, i -> i instanceof BlockItem).stream().map(i -> (BlockItem) i).collect(Collectors.toSet()));
registerItemOverrides(items);
takeAll(items, i -> i instanceof ItemLens).forEach(i -> getBuilder(name(i)).parent(getExistingFile(GENERATED))
.texture("layer0", prefix("item/lens"))
.texture("layer1", prefix("item/" + name(i))));
registerItems(items);
}
private static String name(Item i) {
@@ -63,14 +61,50 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
private static final ResourceLocation GENERATED = new ResourceLocation("item/generated");
private ItemModelBuilder generatedItem(String name) {
return getBuilder(name).parent(getExistingFile(GENERATED))
.texture("layer0", prefix("item/" + name));
return withExistingParent(name, GENERATED)
.texture("layer0", prefix("item/" + name));
}
private ItemModelBuilder generatedItem(Item i) {
return generatedItem(name(i));
}
private void registerItems(Set<Item> items) {
// Written manually
items.remove(manaGun);
takeAll(items, i -> i instanceof ItemLens).forEach(i ->
withExistingParent(name(i), GENERATED)
.texture("layer0", prefix("item/lens"))
.texture("layer1", prefix("item/" + name(i))));
generatedItem(bloodPendant)
.texture("layer1", prefix("item/" + name(bloodPendant) + "_overlay"));
items.remove(bloodPendant);
generatedItem(enderDagger)
.texture("layer1", prefix("item/" + name(enderDagger) + "_overlay"));
items.remove(enderDagger);
generatedItem(incenseStick)
.texture("layer1", prefix("item/" + name(incenseStick) + "_overlay"));
items.remove(incenseStick);
generatedItem(manaMirror)
.texture("layer1", prefix("item/" + name(manaMirror) + "_overlay"));
items.remove(manaMirror);
generatedItem(manaTablet)
.texture("layer1", prefix("item/" + name(manaTablet) + "_overlay"));
items.remove(manaTablet);
withExistingParent(name(thirdEye), GENERATED)
.texture("layer0", prefix("item/" + name(thirdEye) + "_0"))
.texture("layer1", prefix("item/" + name(thirdEye) + "_1"))
.texture("layer2", prefix("item/" + name(thirdEye) + "_2"));
items.remove(thirdEye);
}
private void registerItemOverrides(Set<Item> items) {
// Written manually
items.remove(livingwoodBow);
@@ -86,7 +120,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
.texture("layer1", prefix("item/" + name(brewFlask) + "_0"));
for (int i = 1; i <= 5; i++) {
String overrideName = name(brewFlask) + "_" + i;
ModelFile overrideModel = getBuilder(overrideName)
ModelFile overrideModel = withExistingParent(overrideName, GENERATED)
.texture("layer0", prefix("item/" + name(flask)))
.texture("layer1", prefix("item/" + overrideName));
flaskBuilder.override()
@@ -100,7 +134,7 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
.texture("layer1", prefix("item/" + name(brewVial) + "_0"));
for (int i = 1; i <= 3; i++) {
String overrideName = name(brewVial) + "_" + i;
ModelFile overrideModel = getBuilder(overrideName)
ModelFile overrideModel = withExistingParent(overrideName, GENERATED)
.texture("layer0", prefix("item/" + name(vial)))
.texture("layer1", prefix("item/" + overrideName));
vialBuilder.override()
@@ -201,12 +235,10 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
.model(generatedItem(name(terraAxe) + "_active")).end();
items.remove(terraAxe);
ModelFile enabledModel = getBuilder(name(terraPick) + "_active")
.parent(getExistingFile(GENERATED))
ModelFile enabledModel = withExistingParent(name(terraPick) + "_active", GENERATED)
.texture("layer0", prefix("item/" + name(terraPick)))
.texture("layer1", prefix("item/" + name(terraPick) + "_active"));
ModelFile tippedEnabledModel = getBuilder(name(terraPick) + "_tipped_active")
.parent(getExistingFile(GENERATED))
ModelFile tippedEnabledModel = withExistingParent(name(terraPick) + "_tipped_active", GENERATED)
.texture("layer0", prefix("item/" + name(terraPick) + "_tipped"))
.texture("layer1", prefix("item/" + name(terraPick) + "_active"));
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/pendant_blood_chain"
"layer0": "botania:item/blood_pendant_chain"
}
}
@@ -1,6 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/pendant_blood_gem"
"layer0": "botania:item/blood_pendant_gem"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/pendant_blood",
"layer1": "botania:item/pendant_blood_overlay"
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "botania:item/desugun0",
"layer1": "botania:item/desugun1"
"layer0": "botania:item/desu_gun",
"layer1": "botania:item/desu_gun_overlay"
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/desugun2",
"layer1": "botania:item/desugun1"
"layer0": "botania:item/desu_gun_clip",
"layer1": "botania:item/desu_gun_overlay"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/stick_incense",
"layer1": "botania:item/stick_incense_overlay"
}
}
@@ -1,8 +0,0 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/third_eye_0",
"layer1": "botania:item/third_eye_1",
"layer2": "botania:item/third_eye_2"
}
}
File renamed without changes.

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 491 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 308 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 398 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 183 B

After

Width:  |  Height:  |  Size: 183 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB