From b2cbe03b7fdd94fb322f3c7880900ab0940612c3 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 17 Sep 2022 22:22:36 +0200 Subject: [PATCH] Frog Hat --- .../4c6aefd01d2f404cb6dd8a4f408ce8f3778751da | 36 +++++++++---------- .../8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 | 4 +-- .../assets/create/lang/unfinished/de_de.json | 2 +- .../assets/create/lang/unfinished/es_cl.json | 2 +- .../assets/create/lang/unfinished/es_es.json | 2 +- .../assets/create/lang/unfinished/fr_fr.json | 2 +- .../assets/create/lang/unfinished/it_it.json | 2 +- .../assets/create/lang/unfinished/ja_jp.json | 2 +- .../assets/create/lang/unfinished/ko_kr.json | 2 +- .../assets/create/lang/unfinished/nl_nl.json | 2 +- .../assets/create/lang/unfinished/pl_pl.json | 2 +- .../assets/create/lang/unfinished/pt_br.json | 2 +- .../assets/create/lang/unfinished/pt_pt.json | 2 +- .../assets/create/lang/unfinished/ro_ro.json | 2 +- .../assets/create/lang/unfinished/ru_ru.json | 2 +- .../assets/create/lang/unfinished/uk_ua.json | 2 +- .../assets/create/lang/unfinished/zh_cn.json | 2 +- .../assets/create/lang/unfinished/zh_tw.json | 2 +- .../create/tags/blocks/fan_transparent.json | 3 +- .../java/com/simibubi/create/AllTags.java | 1 + .../components/actors/SeatEntity.java | 3 ++ .../schedule/TrainHatArmorLayer.java | 9 ++++- .../management/schedule/TrainHatOffsets.java | 4 +++ 23 files changed, 54 insertions(+), 38 deletions(-) diff --git a/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da b/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da index 3a6f4c6ff..a201c2b2a 100644 --- a/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da +++ b/src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da @@ -1,18 +1,18 @@ -// 1.19.2 2022-09-06T15:47:33.6198974 Lang merger -75ff93ca417508e99366b12fb847ae538c9efd3f assets/create/lang/en_us.json -d35c5761372f7d24895831d072ee5fa2c9d62989 assets/create/lang/unfinished/de_de.json -ea839cef2282b2adf87f389db484d42132f020e5 assets/create/lang/unfinished/es_cl.json -9602fc4fdea27ce127327579293a5211c1d146f1 assets/create/lang/unfinished/es_es.json -9cf5e657bcb9dced3762b4c37f435043c2257689 assets/create/lang/unfinished/fr_fr.json -8b3d3bc7092f9bd06282931a3cbc909b337e7000 assets/create/lang/unfinished/it_it.json -5a0dfc27e00c9edbe605bff1acd484d316ac4234 assets/create/lang/unfinished/ja_jp.json -9c13085d2a94687a693369724c9280aca5ec9acd assets/create/lang/unfinished/ko_kr.json -9143a669f24557bd31f559ac9db215d120ac6640 assets/create/lang/unfinished/nl_nl.json -f944f6188b5f4732172485b4f07ef498550bc1b9 assets/create/lang/unfinished/pl_pl.json -fda24e5f60550f683eb2082ef45e42c0937887db assets/create/lang/unfinished/pt_br.json -8ff2f07fe8c5d9473e4f08f4c8bce3733637190b assets/create/lang/unfinished/pt_pt.json -a6ddb0fd2350f1d92416b0a23de60e591f59edad assets/create/lang/unfinished/ro_ro.json -9cab5179ea484f0a2256c3bb9aaa215646555662 assets/create/lang/unfinished/ru_ru.json -8497a7199ce98e43e3d0a7957b1f681557f54b53 assets/create/lang/unfinished/uk_ua.json -1e6355c5e6d5f9ea93cbbabf07291b8bc6bfefb9 assets/create/lang/unfinished/zh_cn.json -2a3e0a986682278d96c3d2fdd316255fde7e9e55 assets/create/lang/unfinished/zh_tw.json +// 1.19.2 2022-09-17T21:51:07.3712389 Lang merger +ca7295cdf5aedac28119596bf480757bf3ff4b17 assets/create/lang/en_us.json +a983fbc8286052188d28afd01de061bb3c97eea3 assets/create/lang/unfinished/de_de.json +f892b130f0b1ccac28c6e7d4e69d81cb1190b466 assets/create/lang/unfinished/es_cl.json +affc91bb228051babc38cbbc40986b6554b3ddaa assets/create/lang/unfinished/es_es.json +1296d8eb7489184c2e6099a6d784ddf1d676e337 assets/create/lang/unfinished/fr_fr.json +433bd052bf87efb9fb57bb2848442d83dde436ec assets/create/lang/unfinished/it_it.json +948747c66214f34510568eea3b93ee49bd690448 assets/create/lang/unfinished/ja_jp.json +5b3c88caf51dff87ea23be21c0ccda4973f57032 assets/create/lang/unfinished/ko_kr.json +27ae9264c43dc0712e49867e2e72accc170fa889 assets/create/lang/unfinished/nl_nl.json +7dc0293b0407ce4cd624732961b1c47c5c71b811 assets/create/lang/unfinished/pl_pl.json +e4dcb5f3260118ae6ff70d0f4000e045426046d9 assets/create/lang/unfinished/pt_br.json +d35b90d4653624ade66cd7d5969743403d9a4f0e assets/create/lang/unfinished/pt_pt.json +9d07accc39dedda6bc67411dbc223dc436f77709 assets/create/lang/unfinished/ro_ro.json +6288290f72d6ff33cbcf0fdcbff927e90d4eab78 assets/create/lang/unfinished/ru_ru.json +c8632e1dbeeb5f7b91d4a50bc616ed2666479ee1 assets/create/lang/unfinished/uk_ua.json +c6071b1b85a10ed8d16c0bfed6966857a6a77c1a assets/create/lang/unfinished/zh_cn.json +c42df91108c442aa0e4e5d6a7ee9938154c9c9c3 assets/create/lang/unfinished/zh_tw.json diff --git a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 index ac8395a33..b2e7e8145 100644 --- a/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 +++ b/src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9 @@ -1,4 +1,4 @@ -// 1.19.2 2022-09-06T15:47:33.6218847 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2022-09-17T21:51:07.3812115 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json @@ -4482,7 +4482,7 @@ fd2aaa5ab155c675e7ef4c143106428f181056af data/create/recipes/weathered_copper_ti f1a03ac86925e26cbec6aeeada2eafb40008fc8e data/create/recipes/weathered_copper_tile_stairs_from_weathered_copper_tiles_stonecutting.json 9987e9a451ed98d1879639e0604a040c46c3055a data/create/tags/blocks/brittle.json 8b6c0b444b15f7fb2d55b9cbcb68537c1269f877 data/create/tags/blocks/casing.json -e22ec7123f64a49ed0c4912ce10fc116e1c20d46 data/create/tags/blocks/fan_transparent.json +6cdcc024d7bc2c631f17958f99fcf4f767dc15db data/create/tags/blocks/fan_transparent.json 4970078b49ddac1b1d500ed0469cedf42bdc3d35 data/create/tags/blocks/non_movable.json 06e13efbb7b0d09ff7ecd1a7dc45a0760b91ad67 data/create/tags/blocks/ore_override_stone.json e3510f08cc217e52b58692dcc7f3eda0289ff751 data/create/tags/blocks/passive_boiler_heaters.json diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 58dc3ed04..d5c777b8b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 840", + "_": "Missing Localizations: 842", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index 4586a1a7d..44a3d7cce 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 986", + "_": "Missing Localizations: 988", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 43554d19b..5963cbf0a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 6", + "_": "Missing Localizations: 8", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index fe74720b3..956fdcdce 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2137", + "_": "Missing Localizations: 2139", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 488677c18..8974aa4bb 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 6", + "_": "Missing Localizations: 8", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 3dd4fd76b..b90d3f2d9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2", + "_": "Missing Localizations: 4", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index c55f4b48a..296d4d9b3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 6", + "_": "Missing Localizations: 8", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index ec2b9b9b4..e024272ac 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2485", + "_": "Missing Localizations: 2487", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index 1d233faae..2b88207ed 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 10", + "_": "Missing Localizations: 12", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index c755998fc..c66d1e001 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1329", + "_": "Missing Localizations: 1331", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json index bf9b45fe5..212b2952b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2194", + "_": "Missing Localizations: 2196", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json index 2adfac2f9..05e1d423b 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 653", + "_": "Missing Localizations: 655", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 27e9fa7eb..8d6dbd776 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2", + "_": "Missing Localizations: 4", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/uk_ua.json b/src/generated/resources/assets/create/lang/unfinished/uk_ua.json index f8c2f54b7..4b1d51fca 100644 --- a/src/generated/resources/assets/create/lang/unfinished/uk_ua.json +++ b/src/generated/resources/assets/create/lang/unfinished/uk_ua.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 984", + "_": "Missing Localizations: 986", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 18ed64503..dda75f7d2 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 2", + "_": "Missing Localizations: 4", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index 00e970530..6d1e91d7d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 6", + "_": "Missing Localizations: 8", "_": "->------------------------] Game Elements [------------------------<-", diff --git a/src/generated/resources/data/create/tags/blocks/fan_transparent.json b/src/generated/resources/data/create/tags/blocks/fan_transparent.json index 98b820355..31f1beff8 100644 --- a/src/generated/resources/data/create/tags/blocks/fan_transparent.json +++ b/src/generated/resources/data/create/tags/blocks/fan_transparent.json @@ -5,6 +5,7 @@ "create:sail_frame", "#minecraft:fences", "#minecraft:campfires", - "minecraft:iron_bars" + "minecraft:iron_bars", + "minecraft:mangrove_roots" ] } \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllTags.java b/src/main/java/com/simibubi/create/AllTags.java index f5071814b..5a9633245 100644 --- a/src/main/java/com/simibubi/create/AllTags.java +++ b/src/main/java/com/simibubi/create/AllTags.java @@ -399,6 +399,7 @@ public class AllTags { AllBlockTags.FAN_TRANSPARENT.includeAll(BlockTags.FENCES); AllBlockTags.FAN_TRANSPARENT.includeAll(BlockTags.CAMPFIRES); AllBlockTags.FAN_TRANSPARENT.add(Blocks.IRON_BARS); + AllBlockTags.FAN_TRANSPARENT.add(Blocks.MANGROVE_ROOTS); AllBlockTags.PASSIVE_BOILER_HEATERS.includeAll(BlockTags.FIRE); AllBlockTags.PASSIVE_BOILER_HEATERS.includeAll(BlockTags.CAMPFIRES); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java index 761a6c30b..428de3790 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatEntity.java @@ -17,6 +17,7 @@ import net.minecraft.world.entity.TamableAnimal; import net.minecraft.world.entity.animal.Cat; import net.minecraft.world.entity.animal.Parrot; import net.minecraft.world.entity.animal.Wolf; +import net.minecraft.world.entity.animal.frog.Frog; import net.minecraft.world.entity.monster.Creeper; import net.minecraft.world.entity.monster.Skeleton; import net.minecraft.world.entity.monster.Slime; @@ -73,6 +74,8 @@ public class SeatEntity extends Entity implements IEntityAdditionalSpawnData { return 1 / 8f; if (entity instanceof Wolf) return 1 / 16f; + if (entity instanceof Frog) + return 1 / 8f + 1 / 64f; return 0; } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java index cd13804f6..3e2111355 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatArmorLayer.java @@ -13,6 +13,7 @@ import com.simibubi.create.foundation.utility.Couple; import net.minecraft.client.model.AgeableListModel; import net.minecraft.client.model.AxolotlModel; import net.minecraft.client.model.EntityModel; +import net.minecraft.client.model.FrogModel; import net.minecraft.client.model.HierarchicalModel; import net.minecraft.client.model.LavaSlimeModel; import net.minecraft.client.model.SlimeModel; @@ -59,6 +60,7 @@ public class TrainHatArmorLayer boolean valid = false; TransformStack msr = TransformStack.cast(ms); + float scale = 1; if (entityModel instanceof AgeableListModel model) { if (model.young) { @@ -98,13 +100,18 @@ public class TrainHatArmorLayer if (model instanceof WardenModel) head = model.root().children.get("bone").children.get("body").children.get("head"); + if (model instanceof FrogModel) { + head = model.root().children.get("body").children.get("head"); + scale = .5f; + } + if (head != null) { head.translateAndRotate(ms); if (!head.isEmpty()) { Cube cube = head.cubes.get(0); ms.translate(offset.x, (cube.minY - cube.maxY + offset.y) / 16f, offset.z / 16f); - float max = Math.max(cube.maxX - cube.minX, cube.maxZ - cube.minZ) / (slime ? 6.5f : 8f); + float max = Math.max(cube.maxX - cube.minX, cube.maxZ - cube.minZ) / (slime ? 6.5f : 8f) * scale; ms.scale(max, max, max); } diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java index baa4f195e..a98383e95 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/management/schedule/TrainHatOffsets.java @@ -8,6 +8,7 @@ import net.minecraft.client.model.ChickenModel; import net.minecraft.client.model.CowModel; import net.minecraft.client.model.EntityModel; import net.minecraft.client.model.FoxModel; +import net.minecraft.client.model.FrogModel; import net.minecraft.client.model.GuardianModel; import net.minecraft.client.model.HierarchicalModel; import net.minecraft.client.model.HoglinModel; @@ -95,6 +96,9 @@ public class TrainHatOffsets { } else if (model instanceof WardenModel) { y += 3.5f; z += .5f; + } else if (model instanceof FrogModel) { + y += 16.75f; + z -= .25f; } }