Generate more stuff

This commit is contained in:
Vincent Lee committed 2020-07-19 17:31:58 -05:00
1 parent dc3d1bd4ce
commit 8fd0534fe9
70 files changed
+153 -132

No files matched your search

@@ -1,39 +1,39 @@
{
"parent": "minecraft:item/generated",
"parent": "item/generated",
"textures": {
"layer0": "botania:item/flask0",
"layer1": "botania:item/flask1_0"
"layer0": "botania:item/flask",
"layer1": "botania:item/brew_flask_0"
},
"overrides": [
{
"predicate": {
"botania:swigs_taken": 1
"botania:swigs_taken": 1.0
},
"model": "botania:item/brew_flask_1"
},
{
"predicate": {
"botania:swigs_taken": 2
"botania:swigs_taken": 2.0
},
"model": "botania:item/brew_flask_2"
},
{
"predicate": {
"botania:swigs_taken": 3
"botania:swigs_taken": 3.0
},
"model": "botania:item/brew_flask_3"
},
{
"predicate": {
"botania:swigs_taken": 4
"botania:swigs_taken": 4.0
},
"model": "botania:item/brew_flask_4"
},
{
"predicate": {
"botania:swigs_taken": 5
"botania:swigs_taken": 5.0
},
"model": "botania:item/brew_flask_5"
}
]
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/flask",
"layer1": "botania:item/brew_flask_1"
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/flask",
"layer1": "botania:item/brew_flask_2"
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/flask",
"layer1": "botania:item/brew_flask_3"
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/flask",
"layer1": "botania:item/brew_flask_4"
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/flask",
"layer1": "botania:item/brew_flask_5"
}
}
@@ -1,27 +1,27 @@
{
"parent": "minecraft:item/generated",
"parent": "item/generated",
"textures": {
"layer0": "botania:item/vial0",
"layer1": "botania:item/vial1_0"
"layer0": "botania:item/vial",
"layer1": "botania:item/brew_vial_0"
},
"overrides": [
{
"predicate": {
"botania:swigs_taken": 1
"botania:swigs_taken": 1.0
},
"model": "botania:item/brew_vial_1"
},
{
"predicate": {
"botania:swigs_taken": 2
"botania:swigs_taken": 2.0
},
"model": "botania:item/brew_vial_2"
},
{
"predicate": {
"botania:swigs_taken": 3
"botania:swigs_taken": 3.0
},
"model": "botania:item/brew_vial_3"
}
]
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/vial",
"layer1": "botania:item/brew_vial_1"
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/vial",
"layer1": "botania:item/brew_vial_2"
}
}
@@ -0,0 +1,6 @@
{
"textures": {
"layer0": "botania:item/vial",
"layer1": "botania:item/brew_vial_3"
}
}
@@ -1,38 +1,38 @@
{
"parent": "minecraft:item/generated",
"parent": "item/generated",
"textures": {
"layer0": "botania:item/bottle_mana_0"
"layer0": "botania:item/mana_bottle"
},
"overrides": [
{
"predicate": {
"botania:swigs_taken": 1
"botania:swigs_taken": 1.0
},
"model": "botania:item/mana_bottle_1"
},
{
"predicate": {
"botania:swigs_taken": 2
"botania:swigs_taken": 2.0
},
"model": "botania:item/mana_bottle_2"
},
{
"predicate": {
"botania:swigs_taken": 3
"botania:swigs_taken": 3.0
},
"model": "botania:item/mana_bottle_3"
},
{
"predicate": {
"botania:swigs_taken": 4
"botania:swigs_taken": 4.0
},
"model": "botania:item/mana_bottle_4"
},
{
"predicate": {
"botania:swigs_taken": 5
"botania:swigs_taken": 5.0
},
"model": "botania:item/mana_bottle_5"
}
]
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_bottle_1"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_bottle_2"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_bottle_3"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_bottle_4"
}
}
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "botania:item/mana_bottle_5"
}
}
@@ -72,11 +72,43 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
}
private void registerItemOverrides(Set<Item> items) {
// Written manually
items.remove(livingwoodBow);
items.remove(crystalBow);
generatedItem(blackHoleTalisman).override()
.predicate(prefix("active"), 1)
.model(generatedItem(name(blackHoleTalisman) + "_active")).end();
items.remove(blackHoleTalisman);
ItemModelBuilder flaskBuilder = withExistingParent(name(brewFlask), GENERATED)
.texture("layer0", prefix("item/" + name(flask)))
.texture("layer1", prefix("item/" + name(brewFlask) + "_0"));
for (int i = 1; i <= 5; i++) {
String overrideName = name(brewFlask) + "_" + i;
ModelFile overrideModel = getBuilder(overrideName)
.texture("layer0", prefix("item/" + name(flask)))
.texture("layer1", prefix("item/" + overrideName));
flaskBuilder.override()
.predicate(prefix("swigs_taken"), i)
.model(overrideModel).end();
}
items.remove(brewFlask);
ItemModelBuilder vialBuilder = withExistingParent(name(brewVial), GENERATED)
.texture("layer0", prefix("item/" + name(vial)))
.texture("layer1", prefix("item/" + name(brewVial) + "_0"));
for (int i = 1; i <= 3; i++) {
String overrideName = name(brewVial) + "_" + i;
ModelFile overrideModel = getBuilder(overrideName)
.texture("layer0", prefix("item/" + name(vial)))
.texture("layer1", prefix("item/" + overrideName));
vialBuilder.override()
.predicate(prefix("swigs_taken"), i)
.model(overrideModel).end();
}
items.remove(brewVial);
generatedItem(elementiumShears).override()
.predicate(prefix("reddit"), 1)
.model(generatedItem("dammitreddit")).end();
@@ -110,6 +142,15 @@ public class ItemModelProvider extends net.minecraftforge.client.model.generator
.model(generatedItem(name(magnetRingGreater) + "_active")).end();
items.remove(magnetRingGreater);
ItemModelBuilder bottle = generatedItem(manaBottle);
for (int i = 1; i <= 5; i++) {
ModelFile overrideModel = generatedItem(name(manaBottle) + "_" + i);
bottle.override()
.predicate(prefix("swigs_taken"), i)
.model(overrideModel).end();
}
items.remove(manaBottle);
generatedItem(manaCookie).override()
.predicate(prefix("totalbiscuit"), 1)
.model(generatedItem("totalbiscuit")).end();
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/flask0",
"layer1": "botania:item/flask1_1"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/flask0",
"layer1": "botania:item/flask1_2"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/flask0",
"layer1": "botania:item/flask1_3"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/flask0",
"layer1": "botania:item/flask1_4"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/flask0",
"layer1": "botania:item/flask1_5"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/vial0",
"layer1": "botania:item/vial1_1"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/vial0",
"layer1": "botania:item/vial1_2"
}
}
@@ -1,7 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/vial0",
"layer1": "botania:item/vial1_3"
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bow_crystal"
"layer0": "botania:item/crystal_bow"
},
"display": {
"thirdperson_righthand": {
@@ -1,6 +1,6 @@
{
"parent": "botania:item/crystal_bow",
"textures": {
"layer0": "botania:item/bow_crystal_pulling_1"
"layer0": "botania:item/crystal_bow_pulling_1"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:item/crystal_bow",
"textures": {
"layer0": "botania:item/bow_crystal_pulling_2"
"layer0": "botania:item/crystal_bow_pulling_2"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:item/crystal_bow",
"textures": {
"layer0": "botania:item/bow_crystal_pulling_3"
"layer0": "botania:item/crystal_bow_pulling_3"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:item/crystal_bow",
"textures": {
"layer0": "botania:item/bow_crystal_pulling_4"
"layer0": "botania:item/crystal_bow_pulling_4"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:item/crystal_bow",
"textures": {
"layer0": "botania:item/bow_crystal_pulling_5"
"layer0": "botania:item/crystal_bow_pulling_5"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "botania:item/special_elucidator"
}
}
@@ -1,7 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bow_livingwood"
"layer0": "botania:item/livingwood_bow"
},
"display": {
"thirdperson_righthand": {
@@ -1,6 +1,6 @@
{
"parent": "botania:item/livingwood_bow",
"textures": {
"layer0": "botania:item/bow_livingwood_pulling_1"
"layer0": "botania:item/livingwood_bow_pulling_1"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:item/livingwood_bow",
"textures": {
"layer0": "botania:item/bow_livingwood_pulling_2"
"layer0": "botania:item/livingwood_bow_pulling_2"
}
}
@@ -1,6 +1,6 @@
{
"parent": "botania:item/livingwood_bow",
"textures": {
"layer0": "botania:item/bow_livingwood_pulling_3"
"layer0": "botania:item/livingwood_bow_pulling_3"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bottle_mana_1"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bottle_mana_2"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bottle_mana_3"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bottle_mana_4"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/bottle_mana_5"
}
}
@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "botania:item/special_totalbiscuit"
}
}
File renamed without changes.

Before

Width:  |  Height:  |  Size: 341 B

After

Width:  |  Height:  |  Size: 341 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 314 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 294 B

After

Width:  |  Height:  |  Size: 294 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 257 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 248 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 206 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 305 B

After

Width:  |  Height:  |  Size: 305 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 284 B

After

Width:  |  Height:  |  Size: 284 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 253 B

After

Width:  |  Height:  |  Size: 253 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 231 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 404 B

After

Width:  |  Height:  |  Size: 404 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 412 B

After

Width:  |  Height:  |  Size: 412 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 424 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 424 B

After

Width:  |  Height:  |  Size: 424 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 437 B

After

Width:  |  Height:  |  Size: 437 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 415 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 625 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 676 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 671 B

After

Width:  |  Height:  |  Size: 671 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 667 B

After

Width:  |  Height:  |  Size: 667 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 443 B

After

Width:  |  Height:  |  Size: 443 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 432 B

After

Width:  |  Height:  |  Size: 432 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 440 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 427 B

After

Width:  |  Height:  |  Size: 427 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 415 B

After

Width:  |  Height:  |  Size: 415 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 385 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 379 B