From e12947abec946e13d998db9a829fd4e22452908e Mon Sep 17 00:00:00 2001 From: Zepalesque <60141811+Zepalesque@users.noreply.github.com> Date: Wed, 29 May 2024 19:15:56 -0400 Subject: [PATCH] datagen --- .../22373c0826f5c6678d0d4a856e70f468cc114367 | 4 ++-- .../55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 | 12 ++++++------ .../blockstates/short_aether_grass.json | 16 ++++++++-------- .../assets/aether_redux/lang/en_us.json | 4 +++- ...ther_grass.json => medoium_aether_grass.json} | 2 +- ...d_grass.json => medoium_enchanted_grass.json} | 2 +- ...aether_grass.json => short_aether_grass.json} | 2 +- ...ted_grass.json => short_enchanted_grass.json} | 2 +- 8 files changed, 23 insertions(+), 21 deletions(-) rename src/generated/resources/assets/aether_redux/models/block/{medium_aether_grass.json => medoium_aether_grass.json} (62%) rename src/generated/resources/assets/aether_redux/models/block/{medium_enchanted_grass.json => medoium_enchanted_grass.json} (59%) rename src/generated/resources/assets/aether_redux/models/block/{small_aether_grass.json => short_aether_grass.json} (63%) rename src/generated/resources/assets/aether_redux/models/block/{small_enchanted_grass.json => short_enchanted_grass.json} (60%) diff --git a/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 b/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 index b97e11447..1eb72d81c 100644 --- a/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 +++ b/src/generated/resources/.cache/22373c0826f5c6678d0d4a856e70f468cc114367 @@ -1,2 +1,2 @@ -// 1.20.4 2024-05-27T19:01:00.3810053 Languages: en_us for mod: aether_redux -b67de17935c67fb4e35b4f6d40a2382b334ae168 assets/aether_redux/lang/en_us.json +// 1.20.4 2024-05-29T19:15:43.1175188 Languages: en_us for mod: aether_redux +d747373efc73449805d2d6c9635079bb2ac68cb9 assets/aether_redux/lang/en_us.json diff --git a/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 b/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 index bffa8064a..8eca1b397 100644 --- a/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 +++ b/src/generated/resources/.cache/55f810cc3131b5fe7f36364d9ea7eac3f79a56c5 @@ -1,4 +1,4 @@ -// 1.20.4 2024-05-27T19:01:00.3929977 Block States: aether_redux +// 1.20.4 2024-05-29T19:15:43.1215174 Block States: aether_redux 18cd9d7be4a20d14e14911da277c38674c1d5bd7 assets/aether_redux/blockstates/blightmoss_holystone.json 4a9e03ff69be912c7f686d6ca7b72f228650f9e4 assets/aether_redux/blockstates/blightmoss_holystone_slab.json a4d1a11a2343f5488e53fdc549758dfabb46f198 assets/aether_redux/blockstates/blightmoss_holystone_stairs.json @@ -33,7 +33,7 @@ fd526c61dfe4ba23e7ed12f310f32a7d44bab640 assets/aether_redux/blockstates/sentrit e568dc303d9bbc55ec7f77cc19877c60d1ae29bc assets/aether_redux/blockstates/sentrite_slab.json 426b3f61a00c880d894a1e6790695fcd93e0e7a1 assets/aether_redux/blockstates/sentrite_stairs.json 543164ff80eb0fc4779b6ea7e7981ffa531b73fb assets/aether_redux/blockstates/sentrite_wall.json -59c18a36dc24049558f1d279bbfe7a930ec719b2 assets/aether_redux/blockstates/short_aether_grass.json +dfe18830bbe0886f599645bfcaf425480d2b8c39 assets/aether_redux/blockstates/short_aether_grass.json 1aec7a77858add0e066cf4db0efcc4ca90c819e9 assets/aether_redux/blockstates/stripped_crystal_log.json 3dfefb51cf3cdcc8235e85f74ab540f452b15914 assets/aether_redux/blockstates/stripped_crystal_log_wall.json 0ad51c45ec19e74c7fbbfa63e55ccdbca81ee3cb assets/aether_redux/blockstates/stripped_crystal_wood.json @@ -112,8 +112,8 @@ ae5eeaa5a73d3ad4f7e4fd91454915070fb90bbf assets/aether_redux/models/block/gilded 585e3f4e6ef4b567978a22ab098e0644dcafb5d7 assets/aether_redux/models/block/gilded_holystone_wall_post.json 1f67a088e7bbf029864e20c05e03ef291b8a4e63 assets/aether_redux/models/block/gilded_holystone_wall_side.json 3843630e5e3ddf48d77e4069af6020cc8d255f3b assets/aether_redux/models/block/gilded_holystone_wall_side_tall.json -074e7c7cc4162fdb2aadb64186ba0bc7425dd11f assets/aether_redux/models/block/medium_aether_grass.json -7e90177f893d151767db272f1a6271eda32a6ab1 assets/aether_redux/models/block/medium_enchanted_grass.json +b4e56903173c651264fab25ac766825a7123b1e3 assets/aether_redux/models/block/medoium_aether_grass.json +6609da3d80c1e811dd91c140bc342206f8c6a6fd assets/aether_redux/models/block/medoium_enchanted_grass.json e8369ef445865819d7d44332845dcbf1eda944f4 assets/aether_redux/models/block/sentrite.json 38e3fe9c07ae6ca8d479ab0f1f716460ceca2395 assets/aether_redux/models/block/sentrite_bricks.json e44783923af5b451199a6d6b917f18b073e6f7be assets/aether_redux/models/block/sentrite_brick_slab.json @@ -132,8 +132,8 @@ a6a2a25fa796a18fa3a074bbfe72270b27d53757 assets/aether_redux/models/block/sentri 49fb4dd038ef8e6b7c9dfd03f7a081aa2ff20828 assets/aether_redux/models/block/sentrite_wall_post.json 25fca673e6eadb08f386228a1ab5320aa65bfb14 assets/aether_redux/models/block/sentrite_wall_side.json 734c26cd545a59c649b63067caaad1d6886f2460 assets/aether_redux/models/block/sentrite_wall_side_tall.json -494ec9980bd9f347846a18cc9e17986237fbfec7 assets/aether_redux/models/block/small_aether_grass.json -6058b6a0ba684ce5b3494d2b8a06d25d8d5b3eee assets/aether_redux/models/block/small_enchanted_grass.json +2bf955afd47f41c919e5f5a1b78c76d4c6a6b6a9 assets/aether_redux/models/block/short_aether_grass.json +00e16fd7a7d8043c5fafb7852d99223485c5b8a5 assets/aether_redux/models/block/short_enchanted_grass.json 3701b1fca30ce724af63ddc67ed9de81a3778464 assets/aether_redux/models/block/stripped_crystal_log.json 33f46407906ad405a236f0c8fd1b6cab4380292e assets/aether_redux/models/block/stripped_crystal_log_horizontal.json 1894cb6354bf42861c6f052a911f911a5461f019 assets/aether_redux/models/block/stripped_crystal_log_wall_post.json diff --git a/src/generated/resources/assets/aether_redux/blockstates/short_aether_grass.json b/src/generated/resources/assets/aether_redux/blockstates/short_aether_grass.json index f90f677f2..74a9d2326 100644 --- a/src/generated/resources/assets/aether_redux/blockstates/short_aether_grass.json +++ b/src/generated/resources/assets/aether_redux/blockstates/short_aether_grass.json @@ -1,19 +1,19 @@ { "variants": { - "enchanted=false,grass_size=medium": { - "model": "aether_redux:block/medium_aether_grass" + "enchanted=false,grass_size=medoium": { + "model": "aether_redux:block/medoium_aether_grass" }, - "enchanted=false,grass_size=small": { - "model": "aether_redux:block/small_aether_grass" + "enchanted=false,grass_size=short": { + "model": "aether_redux:block/short_aether_grass" }, "enchanted=false,grass_size=tall": { "model": "aether_redux:block/tall_aether_grass" }, - "enchanted=true,grass_size=medium": { - "model": "aether_redux:block/medium_enchanted_grass" + "enchanted=true,grass_size=medoium": { + "model": "aether_redux:block/medoium_enchanted_grass" }, - "enchanted=true,grass_size=small": { - "model": "aether_redux:block/small_enchanted_grass" + "enchanted=true,grass_size=short": { + "model": "aether_redux:block/short_enchanted_grass" }, "enchanted=true,grass_size=tall": { "model": "aether_redux:block/tall_enchanted_grass" diff --git a/src/generated/resources/assets/aether_redux/lang/en_us.json b/src/generated/resources/assets/aether_redux/lang/en_us.json index d47533145..a47534e10 100644 --- a/src/generated/resources/assets/aether_redux/lang/en_us.json +++ b/src/generated/resources/assets/aether_redux/lang/en_us.json @@ -78,5 +78,7 @@ "lore.block.aether_redux.stripped_crystal_wood_wall": "Crafted from Stripped Crystal _wood. Can be used for decorative enclosures and defences. Great for keeping nasty intruders away!", "lore.item.aether_redux.crystal_boat": "Crafted from Crystal Planks. While the Aether does not have many large bodies of water, a boat can occasionally be a useful tool for crossing large distances over ice!", "lore.item.aether_redux.crystal_chest_boat": "ACrystal Boat with a handy chest in the back. Helpful for transporting more items over long stretches of water, which are famously difficult to find in the Aether.", - "pack.aether_redux.mod.description": "The Aether: Redux Resources" + "pack.aether_redux.mod.description": "The Aether: Redux Resources", + "pack.aether_redux.tintable_grass.description": "Grass tint textures for the Aether: Redux", + "pack.aether_redux.tintable_grass.title": "Redux - Tintable Grass" } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/block/medium_aether_grass.json b/src/generated/resources/assets/aether_redux/models/block/medoium_aether_grass.json similarity index 62% rename from src/generated/resources/assets/aether_redux/models/block/medium_aether_grass.json rename to src/generated/resources/assets/aether_redux/models/block/medoium_aether_grass.json index 507caae34..7d9e7decb 100644 --- a/src/generated/resources/assets/aether_redux/models/block/medium_aether_grass.json +++ b/src/generated/resources/assets/aether_redux/models/block/medoium_aether_grass.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/tinted_cross", "render_type": "minecraft:cutout", "textures": { - "cross": "aether_redux:block/natural/aether_medium_grass" + "cross": "aether_redux:block/natural/aether_medoium_grass" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/block/medium_enchanted_grass.json b/src/generated/resources/assets/aether_redux/models/block/medoium_enchanted_grass.json similarity index 59% rename from src/generated/resources/assets/aether_redux/models/block/medium_enchanted_grass.json rename to src/generated/resources/assets/aether_redux/models/block/medoium_enchanted_grass.json index 911683967..2cd55b638 100644 --- a/src/generated/resources/assets/aether_redux/models/block/medium_enchanted_grass.json +++ b/src/generated/resources/assets/aether_redux/models/block/medoium_enchanted_grass.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cross", "render_type": "minecraft:cutout", "textures": { - "cross": "aether_redux:block/natural/enchanted_medium_grass" + "cross": "aether_redux:block/natural/enchanted_medoium_grass" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/block/small_aether_grass.json b/src/generated/resources/assets/aether_redux/models/block/short_aether_grass.json similarity index 63% rename from src/generated/resources/assets/aether_redux/models/block/small_aether_grass.json rename to src/generated/resources/assets/aether_redux/models/block/short_aether_grass.json index 1920edb06..fc1498d08 100644 --- a/src/generated/resources/assets/aether_redux/models/block/small_aether_grass.json +++ b/src/generated/resources/assets/aether_redux/models/block/short_aether_grass.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/tinted_cross", "render_type": "minecraft:cutout", "textures": { - "cross": "aether_redux:block/natural/aether_small_grass" + "cross": "aether_redux:block/natural/aether_short_grass" } } \ No newline at end of file diff --git a/src/generated/resources/assets/aether_redux/models/block/small_enchanted_grass.json b/src/generated/resources/assets/aether_redux/models/block/short_enchanted_grass.json similarity index 60% rename from src/generated/resources/assets/aether_redux/models/block/small_enchanted_grass.json rename to src/generated/resources/assets/aether_redux/models/block/short_enchanted_grass.json index 95ead4316..200e3f605 100644 --- a/src/generated/resources/assets/aether_redux/models/block/small_enchanted_grass.json +++ b/src/generated/resources/assets/aether_redux/models/block/short_enchanted_grass.json @@ -2,6 +2,6 @@ "parent": "minecraft:block/cross", "render_type": "minecraft:cutout", "textures": { - "cross": "aether_redux:block/natural/enchanted_small_grass" + "cross": "aether_redux:block/natural/enchanted_short_grass" } } \ No newline at end of file