From 4540d92e31e8f2c6cdc6d441b5a9a7045c534b4c Mon Sep 17 00:00:00 2001 From: Reclipse <17797013+ReclipseTheOne@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:42:27 +0200 Subject: [PATCH] Fixed BacteriaStats + New Stat Tooltip --- .../103d9f3f36b01595f1aa5172191e60eff02e6924 | 12 +- .../4d58d921702f57799841730d3d537abc5ea398a2 | 6 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 108 +++++++++--------- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 4 +- .../resources/assets/nautec/lang/en_us.json | 9 +- .../assets/nautec/models/item/breaker.json | 3 + .../nautec/nautec/bacteria/cyanobacteria.json | 1 + .../data/nautec/nautec/bacteria/empty.json | 1 + .../nautec/nautec/bacteria/halobacteria.json | 1 + .../nautec/nautec/bacteria/methanogens.json | 1 + .../nautec/nautec/bacteria/thermophiles.json | 1 + .../content/bacteria/BacteriaStats.java | 3 +- .../nautec/content/items/PetriDishItem.java | 4 +- .../nautec/datagen/EnUsProvider.java | 16 ++- .../nautec/utils/RNGUtils.java | 1 + 15 files changed, 96 insertions(+), 75 deletions(-) create mode 100644 src/generated/resources/assets/nautec/models/item/breaker.json diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 index 42046eb..4b327f0 100644 --- a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 +++ b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 @@ -1,9 +1,9 @@ -// 1.21.1 2024-12-16T23:03:28.632599872 Registries -81ae891c9f56e166f6748e3ee80edccaf52a3c73 data/nautec/nautec/bacteria/cyanobacteria.json -895816a71ba92ab2662725824d004e3c1a462196 data/nautec/nautec/bacteria/empty.json -ed5540fa74500b1db6f27d6c30eeac50ee4f8f9c data/nautec/nautec/bacteria/halobacteria.json -24a515c8c46fbb92431a9aad10ae4c8684ed142f data/nautec/nautec/bacteria/methanogens.json -5d152052e74ab6e5dc7a780c1e2af000469b6e6d data/nautec/nautec/bacteria/thermophiles.json +// 1.21.1 2024-12-19T15:16:06.7633778 Registries +4cc74761a420946768852a3c4e5fba64de831555 data/nautec/nautec/bacteria/cyanobacteria.json +2ceb7d9533a35c6cb05ba68915ecaf868def152a data/nautec/nautec/bacteria/empty.json +ce644e1811997ff67d2f7df856532017272a7b22 data/nautec/nautec/bacteria/halobacteria.json +36808ce13b558579e40af12e305adf733c501003 data/nautec/nautec/bacteria/methanogens.json +165e8d4b95ee84a6c951b35561ba6808bf60c49c data/nautec/nautec/bacteria/thermophiles.json d3949aab832fc1b72c2512c35586c2682dea4d4d data/nautec/worldgen/configured_feature/prismarine_sand_beach.json e9f0c0ce377bc6f731c3b36673e845152a53327d data/nautec/worldgen/configured_feature/prismarine_sand_ocean.json 685d14b2486e0da05c931e69fe78236dd9523cbf data/nautec/worldgen/placed_feature/prismarine_sand_beach.json diff --git a/src/generated/resources/.cache/4d58d921702f57799841730d3d537abc5ea398a2 b/src/generated/resources/.cache/4d58d921702f57799841730d3d537abc5ea398a2 index 66cd3b3..b96015c 100644 --- a/src/generated/resources/.cache/4d58d921702f57799841730d3d537abc5ea398a2 +++ b/src/generated/resources/.cache/4d58d921702f57799841730d3d537abc5ea398a2 @@ -1,4 +1,4 @@ -// 1.21.1 2024-12-16T14:22:25.511340001 Item Models: nautec +// 1.21.1 2024-12-19T15:16:06.7582068 Item Models: nautec 53692692f57914fc54eb6ebf416ce1cb7789e57b assets/nautec/models/item/air_bottle.json cc6ee3887ec6e0c53216dc681ac7b32b34182253 assets/nautec/models/item/anchor.json 2e336fce57acffa1d0eb621baa30a26f665b4924 assets/nautec/models/item/aquarine_steel_axe.json @@ -24,7 +24,9 @@ f60b23b8ca6d44e339c9c415f53102833b4ff633 assets/nautec/models/item/atlantic_gold a95dff0d56139e74443ee5069394ccbe31bc875a assets/nautec/models/item/atlantic_gold_nugget.json 6338d151fe16332a6bd885776f58d9c9a4ffad62 assets/nautec/models/item/augmentation_station.json f616877025b33a5d417689bd59cba3385b11e5c9 assets/nautec/models/item/augmentation_station_extension.json +77496bd37cb0cd85dfb77e146366322e44bfcd63 assets/nautec/models/item/bacterial_analyzer.json cd68bca3502f5a671aa5c4bbd828397047b19b8b assets/nautec/models/item/bio_reactor.json +cc14d169c8083ba22e2cf9eeae1842532d664950 assets/nautec/models/item/breaker.json b1e3c9080ae5a0f78b06fa90f3c5da5b3805f842 assets/nautec/models/item/broken_whisk.json cf1524c962ddbbf1cb5e8782d764e71888a03eb1 assets/nautec/models/item/brown_polymer.json 888a9dd92c350f3174e3cb52f714096944855bd5 assets/nautec/models/item/brown_polymer_block.json @@ -66,12 +68,12 @@ da47351a6e7410de2b6761d4c90edf257d4620aa assets/nautec/models/item/oil_barrel.js c30b2391537fbc383c41aebe69a6eab8b2f9bd31 assets/nautec/models/item/petri_dish.json 888fbf8e3629b4cd0df267581ac130f534f80ac5 assets/nautec/models/item/petri_dish_bacteria.json e8d19ed0a058c92c28efb20a5f8887ff0b78770f assets/nautec/models/item/polished_prismarine.json -113d63fc1bd37fbe0fb477446a06eafa25ce09b1 assets/nautec/models/item/prism_monocle.json 8e22e42d27bc66bc91cc76fd66d0ff5457b585b1 assets/nautec/models/item/prismarine_crystal.json 8b90a03798a28c038b1c16da2f723e90694d182b assets/nautec/models/item/prismarine_crystal_shard.json 09882392c9745a728907f265dd968977ca0f171b assets/nautec/models/item/prismarine_laser_relay.json b01055cbe0dd02e958fe1063758658a9be6b753a assets/nautec/models/item/prismarine_sand.json e0209c5f64b38c19f4b8cc62dc90d23fd5f3bad0 assets/nautec/models/item/prismatic_battery.json +113d63fc1bd37fbe0fb477446a06eafa25ce09b1 assets/nautec/models/item/prism_monocle.json 0441fb5aafacad25af44cc70caad7de17d4d7762 assets/nautec/models/item/rusty_crate.json 546756658cb53a34f117de278d075cbdd09c70ba assets/nautec/models/item/rusty_gear.json 98e84d6566a67fb207e7dc979f77a6a88f2f0fcf assets/nautec/models/item/salt.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index c4c8625..1717200 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,32 +1,20 @@ -// 1.21.1 2024-12-16T15:01:51.431041545 Recipes -11639f08778ec1107c05d822f9beaa1f90e3bb32 data/minecraft/advancement/recipes/misc/cast_iron_ingot_blasting.json -5f305b97f7366fc61918bd266d0bacfa386b16c1 data/minecraft/advancement/recipes/misc/cast_iron_nugget_to_ingot.json -c01db9d69b288d37c769cf605b945ebf60a08e21 data/minecraft/advancement/recipes/misc/diving_chestplate.json -36b0d6b627495be6eaf8d6e567f9c95bdb744f14 data/minecraft/advancement/recipes/misc/diving_chestplate_oxygen.json -1f708c5dccdbb5a569e215ac0621ef2c3daa085d data/minecraft/recipe/cast_iron_ingot_blasting.json -5d8fdeabdc238a5b557a2a159a9ccb30e723703b data/minecraft/recipe/cast_iron_nugget_to_ingot.json -83753bf5ab777551fde11d26262c5f2b947f4a64 data/minecraft/recipe/diving_chestplate.json -d9bd5ed8d761638f07ac753459c333be5e11032b data/minecraft/recipe/diving_chestplate_oxygen.json -0eb4bd206062b5348bb5c146f2800fd99b43042b data/minecraft/recipe/dolphin_fin.json -1d373a9d6f1d9a44589095bc5b67e5e237fe7075 data/minecraft/recipe/drowned_lung.json -bc5369ceacc6f35820c4fbddd5f6311d302b19af data/minecraft/recipe/eldritch_heart.json -8476e4500001a8b1e18c57e5add46ab9b1f43493 data/minecraft/recipe/guardian_eye_augment.json +// 1.21.1 2024-12-19T15:16:06.7611986 Recipes ebae64ded4bb31c5b0cf21d6f4a5df5c4bce9ab0 data/nautec/advancement/recipes/building_blocks/brown_polymer_block.json 056382c183d52a8f0d17b4992017b217f7444060 data/nautec/advancement/recipes/building_blocks/brown_polymer_from_block.json e1102abc52970c4638811a9f3aed423c343b2976 data/nautec/advancement/recipes/building_blocks/chiseled_dark_prismarine.json d8aae0b932dc7603a54c5a804f905b6dcf2f77a2 data/nautec/advancement/recipes/building_blocks/dark_prismarine_pillar.json 8c227a8c475e21c750c907230ff6420791f780d6 data/nautec/advancement/recipes/building_blocks/polished_prismarine.json -95a4e3198eb7336208d8b7154d8cc815b49ab307 data/nautec/advancement/recipes/misc/aquarine_steel_axe.json -258ad51beb8603bf4731f299aba3d55537bad429 data/nautec/advancement/recipes/misc/aquarine_steel_boots.json -e20dff21299a723c25fe2e3350808d40529d7f21 data/nautec/advancement/recipes/misc/aquarine_steel_chestplate.json +8bb770fa05d69e050d699a4a8672f2db42c06240 data/nautec/advancement/recipes/misc/aquarine_axe.json +28e66904f03a4812a62ed5be9e913ba5e3c508a9 data/nautec/advancement/recipes/misc/aquarine_boots.json +33edc1c6d4df263ebc3265db02a9684ccf8f952b data/nautec/advancement/recipes/misc/aquarine_chestplate.json +cc2edd2e2205a0ae07ada372f990992886e4d756 data/nautec/advancement/recipes/misc/aquarine_helmet.json +5efd1cc1017c8e021437b92c44f94f177da31ca2 data/nautec/advancement/recipes/misc/aquarine_hoe.json +d6cf868112be7595f9e4a490bdbe0413ee21790b data/nautec/advancement/recipes/misc/aquarine_leggings.json +4ff566ebb9bf4664f68508464ea0f69af5cd1c66 data/nautec/advancement/recipes/misc/aquarine_pickaxe.json +05fb701e03c918e985ea462144eca28154e15d1a data/nautec/advancement/recipes/misc/aquarine_shovel.json 8f2aba847de10d1a879ff6e4a156fe2390120df5 data/nautec/advancement/recipes/misc/aquarine_steel_compound.json -5b2e91896d66bf6f0e8f28036542115a939bdfce data/nautec/advancement/recipes/misc/aquarine_steel_helmet.json -a72b216b5a43dba19e590200c23f4a85d14c8cc9 data/nautec/advancement/recipes/misc/aquarine_steel_hoe.json -01fc6f69c651349f3952713597e24964c5141ad2 data/nautec/advancement/recipes/misc/aquarine_steel_leggings.json -5509d7fb17d6599c0ec7a2289503a9ab63cd1955 data/nautec/advancement/recipes/misc/aquarine_steel_pickaxe.json -1e6bc5788e66699e79d1f89aa8123e7492ba73c7 data/nautec/advancement/recipes/misc/aquarine_steel_shovel.json -04cafdd4ce8f51a56bd335bb540d658f1a233c4f data/nautec/advancement/recipes/misc/aquarine_steel_sword.json -d105bf1507d29e8c1a25eea476d5566745ca84a9 data/nautec/advancement/recipes/misc/aquarine_steel_wrench.json +d3a4e78e172af38cb5702831380c2364296e3060 data/nautec/advancement/recipes/misc/aquarine_sword.json +7cc3c716c8022d0c684d5f8cc482383e29943742 data/nautec/advancement/recipes/misc/aquarine_wrench.json 0ff88a44c7f1679b9540fa694bd324567be25f01 data/nautec/advancement/recipes/misc/aquatic_catalyst.json 4892a02e14ac5f73378727582505c2c6f671e254 data/nautec/advancement/recipes/misc/augmentation_station.json b52be24dd909e8a30bc3be0e4b48f5336cc80fab data/nautec/advancement/recipes/misc/augmentation_station_extension.json @@ -34,80 +22,92 @@ a99cf9516cbb9353b47e68ecf484902406da4333 data/nautec/advancement/recipes/misc/ba da491fad8a32d01009f9cf53c47ae83a49050a21 data/nautec/advancement/recipes/misc/bed_from_brown_polymer.json 738cece82a6cdccabd0c678682ad4366a0c7d1ca data/nautec/advancement/recipes/misc/book_from_brown_polymer.json 0a69ce6ebf4eb3fdd0643da2840333fb3e81731d data/nautec/advancement/recipes/misc/brown_polymer.json +102e9562fe6a4da921dbddff4699fab974b7d757 data/nautec/advancement/recipes/misc/cast_iron_ingot.json +fab289185a5f001325526ff88b1a44f2c6c60664 data/nautec/advancement/recipes/misc/cast_iron_ingot_blasting.json d954dfc419cb2d5ab0e183b4899d93dae7a32422 data/nautec/advancement/recipes/misc/cast_iron_ingot_from_blasting.json d6a6420d783a5714529e18ba05f0382124f3c4e0 data/nautec/advancement/recipes/misc/cast_iron_nugget.json 939b8a71fa717c6f77dc521309a69952dd701da4 data/nautec/advancement/recipes/misc/cast_iron_rod.json 80c335c97a3e51847dd873dc952a31379bb96d95 data/nautec/advancement/recipes/misc/charger.json 0e407f043ba7d3071850b9c532e97b0f709b6e75 data/nautec/advancement/recipes/misc/claw_robot_arm.json dd0c9fe24b3b03c6b1bc8c1f76d4efbd8560d48e data/nautec/advancement/recipes/misc/crowbar.json -a1c9316078b36be46d2b3cfe4bb9bd6929ff08bc data/nautec/advancement/recipes/misc/deep_sea_drain.json -b8ada0e92e270525f1fbabdd97372d76c1a93add data/nautec/advancement/recipes/misc/deep_sea_drain_wall.json 6509407527141fb273373552cb19b6a67bea0f03 data/nautec/advancement/recipes/misc/diving_boots.json +60d00386e1f31969eb4d530ca52a702474284f91 data/nautec/advancement/recipes/misc/diving_chestplate.json +d35045d3c820fd801c27f2775c11fba724d4ad0b data/nautec/advancement/recipes/misc/diving_chestplate_oxygen.json f453783b629e6901fe593efb42e4a537f9a615fd data/nautec/advancement/recipes/misc/diving_helmet.json 45f2ce9aa457103af0b898a510b7e5a279870619 data/nautec/advancement/recipes/misc/diving_leggings.json -103976aab16087f503404cfee730b36686b1e36d data/nautec/advancement/recipes/misc/etching_acid_bucket.json +904c10cfdd0c6351ee65bd6df33e1f1fd7ea897c data/nautec/advancement/recipes/misc/drain.json +4a060e9070ba237c2fc19d7f62ef29754c46b80d data/nautec/advancement/recipes/misc/drain_wall.json +d3317e2ec05210932441cf9803a819a7701a7f2c data/nautec/advancement/recipes/misc/etching_acid_crafting.json 2e227620c2d867bc1e46276896b5281bb34d7eb0 data/nautec/advancement/recipes/misc/glass_vial.json b5d027104efc60967efadd19812ea2fc23fb2924 data/nautec/advancement/recipes/misc/item_frame_from_brown_polymer.json e8c7d011fc8d7584ae12c127a368e794c349cc43 data/nautec/advancement/recipes/misc/laser_junction.json 5a63e821107905c4834ef94b9dda1d99041e5cc0 data/nautec/advancement/recipes/misc/long_distance_laser.json fa6493a3ef0380850872951ce297171d1708ce63 data/nautec/advancement/recipes/misc/mixer.json 94885315f77dd2362883172287de15e80f1a6e7b data/nautec/advancement/recipes/misc/nautec_guide.json -8b0963164bc58a64ef675d369ac6f4221b8cbebb data/nautec/advancement/recipes/misc/prism_monocle.json -03abc1a326810daa2cccf6acf1d21a55d776bd8b data/nautec/advancement/recipes/misc/prismarine_laser_relay.json +002f4581bd2e95a74b869395702f7a95e2b2c5f5 data/nautec/advancement/recipes/misc/prismarine_relay.json 1eb85648ed5c154f0a465c787ef1cfd4542c3572 data/nautec/advancement/recipes/misc/prismatic_battery.json +8b0963164bc58a64ef675d369ac6f4221b8cbebb data/nautec/advancement/recipes/misc/prism_monocle.json df1f62063c751d0d6939426505f6bb14f6ae7382 data/nautec/advancement/recipes/misc/whisk.json -83490bc77ed0236455b903949d3ef5ee0430d7ed data/nautec/recipe/aquarine_steel_axe.json -2705880f2aec0f82cf5d58ffa1736dbeea7b7452 data/nautec/recipe/aquarine_steel_boots.json -46d7aad5f5ba6a71f021d3ecdc47ec5078ccbd59 data/nautec/recipe/aquarine_steel_chestplate.json +83490bc77ed0236455b903949d3ef5ee0430d7ed data/nautec/recipe/aquarine_axe.json +2705880f2aec0f82cf5d58ffa1736dbeea7b7452 data/nautec/recipe/aquarine_boots.json +46d7aad5f5ba6a71f021d3ecdc47ec5078ccbd59 data/nautec/recipe/aquarine_chestplate.json +3b232c689a28fd2cd108b9eede46708b9b851a5b data/nautec/recipe/aquarine_helmet.json +0236a4740a86925405b8bfddf145edbf77c97e52 data/nautec/recipe/aquarine_hoe.json +1e8f331795a5b23402f372dcefa418c258ae6cc6 data/nautec/recipe/aquarine_leggings.json +4f09212df595932bc8949182e8f75fce8414b666 data/nautec/recipe/aquarine_pickaxe.json +7d292436e361119714329a5ae730048a2a6f2e28 data/nautec/recipe/aquarine_shovel.json c4fdc4aa2913699bef2463d5c929bc4724d180ae data/nautec/recipe/aquarine_steel_compound.json -3b232c689a28fd2cd108b9eede46708b9b851a5b data/nautec/recipe/aquarine_steel_helmet.json -0236a4740a86925405b8bfddf145edbf77c97e52 data/nautec/recipe/aquarine_steel_hoe.json -1e8f331795a5b23402f372dcefa418c258ae6cc6 data/nautec/recipe/aquarine_steel_leggings.json -4f09212df595932bc8949182e8f75fce8414b666 data/nautec/recipe/aquarine_steel_pickaxe.json -7d292436e361119714329a5ae730048a2a6f2e28 data/nautec/recipe/aquarine_steel_shovel.json -c99f07ec9ec3b3e570ab81f9f6b5890fdcf3930f data/nautec/recipe/aquarine_steel_sword.json -78c4da26cb8c9f272043276502bbd017b1c163ea data/nautec/recipe/aquarine_steel_wrench.json +ac8c8ef9122a3e1312b101ce23af51ae019143e5 data/nautec/recipe/aquarine_steel_compound_mixing.json +bfb697fd87f2fb761866405c2a58df7aef434ae2 data/nautec/recipe/aquarine_steel_ingot.json +c99f07ec9ec3b3e570ab81f9f6b5890fdcf3930f data/nautec/recipe/aquarine_sword.json +78c4da26cb8c9f272043276502bbd017b1c163ea data/nautec/recipe/aquarine_wrench.json e5b299cdc66cfaa5d495fc6677a39188d7e05304 data/nautec/recipe/aquatic_catalyst.json -69ccc6392657a824e91bea60558c69e4f26685f1 data/nautec/recipe/aquatic_catalyst_channeling/corals.json -45a043fa8907c3b7f592f8f8b5947f8ea60134be data/nautec/recipe/aquatic_catalyst_channeling/kelp.json ba5f2ec03f05fc1f52d3c03f544988e459826d69 data/nautec/recipe/augmentation_station.json 9c2bc24537825f94866e46c4d37cd820f1f59cc3 data/nautec/recipe/augmentation_station_extension.json 1ed2e8bdcfab093c605a5a5f7c9fcd6c709be258 data/nautec/recipe/banner_from_brown_polymer.json a9c53478ce9eefdcdd917217c32a19cc7fe8344c data/nautec/recipe/bed_from_brown_polymer.json 8ed31c62db2e3f744332a5027d264e3758d46c82 data/nautec/recipe/book_from_brown_polymer.json -b2cb1d73b9e1e2104af451250ff4464197c45531 data/nautec/recipe/brown_polymer.json +1414dd3fe07a9bcdb87c1dcda433476089f02a10 data/nautec/recipe/brown_polymer.json 6818283cb29f588a3b5c60460db0ac59ff0c287e data/nautec/recipe/brown_polymer_block.json 8234eaba36308abfceeda4158ae8975eb16e3c0b data/nautec/recipe/brown_polymer_from_block.json +5d8fdeabdc238a5b557a2a159a9ccb30e723703b data/nautec/recipe/cast_iron_ingot.json +1f708c5dccdbb5a569e215ac0621ef2c3daa085d data/nautec/recipe/cast_iron_ingot_blasting.json ac856492b21e9245de0ba2edcbeda8bc2b06c7fd data/nautec/recipe/cast_iron_ingot_from_blasting.json 0e7ac319099e484ba772e18754213fe7009a42cd data/nautec/recipe/cast_iron_nugget.json 159c149c6f81da00b9f2f73c993f1cf7383786c5 data/nautec/recipe/cast_iron_rod.json a1104a2fca829ca101471417232e05510e405423 data/nautec/recipe/charger.json 8f563bd85ef2e4f655ed27548b35967961ce4035 data/nautec/recipe/chiseled_dark_prismarine.json 7cb4ad5a479e5690ce11e6025ce01a38090012c7 data/nautec/recipe/claw_robot_arm.json +69ccc6392657a824e91bea60558c69e4f26685f1 data/nautec/recipe/corals.json +92b1c892b837a6f4a88591b221bc580fa73ee881 data/nautec/recipe/crate.json f540636f940eb6cab30e9e30319f69ef3a76899b data/nautec/recipe/crowbar.json b4db622a427960600d52b7e951f21cfeab52ca7b data/nautec/recipe/dark_prismarine_pillar.json -cfc02afe736a2867e27a155b5dc8d9f9c9f0f491 data/nautec/recipe/deep_sea_drain.json -039b28f455c293cbe02315c52abc2093c0c52e30 data/nautec/recipe/deep_sea_drain_wall.json 374e9e369089bee2db4da1d961a2a11a93f7e88f data/nautec/recipe/diving_boots.json +83753bf5ab777551fde11d26262c5f2b947f4a64 data/nautec/recipe/diving_chestplate.json +d9bd5ed8d761638f07ac753459c333be5e11032b data/nautec/recipe/diving_chestplate_oxygen.json ad76d1e18615e634a5fd16459f0d0efaeea97cd2 data/nautec/recipe/diving_helmet.json 7ebba94ed073b518f596623e5c9f3e44d80c3ffa data/nautec/recipe/diving_leggings.json -4c6919bb450e81c7560fd15529ef566e0c3690dc data/nautec/recipe/etching_acid_bucket.json +0eb4bd206062b5348bb5c146f2800fd99b43042b data/nautec/recipe/dolphin_fin.json +cfc02afe736a2867e27a155b5dc8d9f9c9f0f491 data/nautec/recipe/drain.json +039b28f455c293cbe02315c52abc2093c0c52e30 data/nautec/recipe/drain_wall.json +1d373a9d6f1d9a44589095bc5b67e5e237fe7075 data/nautec/recipe/drowned_lung.json +9374bb4c1bb1a3e8eb1312ee701560a68be7d033 data/nautec/recipe/eas.json +bc5369ceacc6f35820c4fbddd5f6311d302b19af data/nautec/recipe/eldritch_heart.json +4c6919bb450e81c7560fd15529ef566e0c3690dc data/nautec/recipe/etching_acid_crafting.json +b00568e1261638147c0e1f2433821bb6aa9f42b9 data/nautec/recipe/etching_acid_mixing.json +26b45ba49569a3744a9e7685f679a7da10b08d93 data/nautec/recipe/gear.json fe30c6078bd52f68fa02455d52d2eb51b8718c16 data/nautec/recipe/glass_vial.json -0e781b8c85808d8ee2691a5c39404da2b6a8f061 data/nautec/recipe/item_etching/ancient_valve_to_valve.json -92b1c892b837a6f4a88591b221bc580fa73ee881 data/nautec/recipe/item_etching/rusty_crate_to_crate.json -26b45ba49569a3744a9e7685f679a7da10b08d93 data/nautec/recipe/item_etching/rusty_gear_to_gear.json +8476e4500001a8b1e18c57e5add46ab9b1f43493 data/nautec/recipe/guardian_eye.json 38e5ac85f700956260714f824d8f5688c5385d39 data/nautec/recipe/item_frame_from_brown_polymer.json -bfb697fd87f2fb761866405c2a58df7aef434ae2 data/nautec/recipe/item_transformation/aquarine_steel_compound_to_aquarine_steel_ingot.json -a4bdb97abe0834d405f7584452f78242585e02ff data/nautec/recipe/item_transformation/burnt_coil_to_laser_channeling_coil.json +45a043fa8907c3b7f592f8f8b5947f8ea60134be data/nautec/recipe/kelp.json +a4bdb97abe0834d405f7584452f78242585e02ff data/nautec/recipe/laser_channeling_coil.json 3ff56013c9c1926be24f71bdb57c93527ef7ee28 data/nautec/recipe/laser_junction.json 11d23344db3f6e98c1520328fd6c883bccd8ca57 data/nautec/recipe/long_distance_laser.json 4925f952a200ae56a4e1ad04a45897be4988aad4 data/nautec/recipe/mixer.json -9374bb4c1bb1a3e8eb1312ee701560a68be7d033 data/nautec/recipe/mixing/dried_kelp_slime_ball_prismarine_crystals_seagrass.json -b00568e1261638147c0e1f2433821bb6aa9f42b9 data/nautec/recipe/mixing/pufferfish_gunpowder_bone_meal.json -ac8c8ef9122a3e1312b101ce23af51ae019143e5 data/nautec/recipe/mixing/raw_iron_prismarine_crystals_to_aquarine_steel_compound.json 674df651148d747a200794f496996b82ca94e72f data/nautec/recipe/nautec_guide.json f9596d9be4a76ba5e91496e7396018daa20cccfc data/nautec/recipe/polished_prismarine.json -4fe8f6115c759c654e132afedec76d846f0a89d5 data/nautec/recipe/prism_monocle.json -ac628b97c097227e3af94f13cbe35a2cf3ee3124 data/nautec/recipe/prismarine_laser_relay.json +ac628b97c097227e3af94f13cbe35a2cf3ee3124 data/nautec/recipe/prismarine_relay.json 4745c9855337a311cb5b7211168927a61645d193 data/nautec/recipe/prismatic_battery.json +4fe8f6115c759c654e132afedec76d846f0a89d5 data/nautec/recipe/prism_monocle.json +0e781b8c85808d8ee2691a5c39404da2b6a8f061 data/nautec/recipe/valve.json 266c89a0698de108847ad3b60be50d230822cee4 data/nautec/recipe/whisk.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index a70d390..a7705e3 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.21.1 2024-12-16T12:56:36.5452448 Languages: en_us -cb59c9cda54c192d94a6d91598a550f3a0a55062 assets/nautec/lang/en_us.json +// 1.21.1 2024-12-19T15:27:30.4978381 Languages: en_us +26ff82214c574807b043b3a8a0cc2117f9429b33 assets/nautec/lang/en_us.json diff --git a/src/generated/resources/assets/nautec/lang/en_us.json b/src/generated/resources/assets/nautec/lang/en_us.json index d38adaf..b716efa 100644 --- a/src/generated/resources/assets/nautec/lang/en_us.json +++ b/src/generated/resources/assets/nautec/lang/en_us.json @@ -11,6 +11,11 @@ "augment_type.nautec.dolphin_fin": "Dolphin Fin", "augment_type.nautec.drowned_lung": "Drowned Lung", "augment_type.nautec.guardian_eye": "Guardian Eye", + "bacteria.nautec.cyanobacteria": "Cyanobacteria / Blue-Green algae", + "bacteria.nautec.empty": "Empty", + "bacteria.nautec.halobacteria": "Halobacteria", + "bacteria.nautec.methanogens": "Methanogens", + "bacteria.nautec.thermophiles": "Thermophiles", "block.nautec.aquarine_steel_block": "Aquarine Steel Block", "block.nautec.aquatic_catalyst": "Aquatic Catalyst", "block.nautec.augmentation_station": "Augmentation Station", @@ -228,9 +233,5 @@ "nautec.tool.shovel.ability": "Ability: Mine in a 3x3 Area", "nautec.tool.status": "Status: ", "nautec.tool.sword.ability": "Ability: Deal 70% more damage and spawn lightnings at targets", - "nautec:cyanobacteria": "Cyanobacteria", - "nautec:halobacteria": "Halobacteria", - "nautec:methanogens": "Methanogens", - "nautec:thermophiles": "Thermophiles", "nautec_guide.desc.0": "Nautec's Guide" } \ No newline at end of file diff --git a/src/generated/resources/assets/nautec/models/item/breaker.json b/src/generated/resources/assets/nautec/models/item/breaker.json new file mode 100644 index 0000000..8dd2b7a --- /dev/null +++ b/src/generated/resources/assets/nautec/models/item/breaker.json @@ -0,0 +1,3 @@ +{ + "parent": "nautec:block/breaker" +} \ No newline at end of file diff --git a/src/generated/resources/data/nautec/nautec/bacteria/cyanobacteria.json b/src/generated/resources/data/nautec/nautec/bacteria/cyanobacteria.json index 17b8b0f..03b1bc9 100644 --- a/src/generated/resources/data/nautec/nautec/bacteria/cyanobacteria.json +++ b/src/generated/resources/data/nautec/nautec/bacteria/cyanobacteria.json @@ -1,6 +1,7 @@ { "type": "nautec:simple", "stats": { + "colony_size": 0.0, "color": -13434881, "growth_rate": 0.0, "lifespan": 0, diff --git a/src/generated/resources/data/nautec/nautec/bacteria/empty.json b/src/generated/resources/data/nautec/nautec/bacteria/empty.json index c6a735d..ee4bd21 100644 --- a/src/generated/resources/data/nautec/nautec/bacteria/empty.json +++ b/src/generated/resources/data/nautec/nautec/bacteria/empty.json @@ -1,6 +1,7 @@ { "type": "nautec:simple", "stats": { + "colony_size": 0.0, "color": 0, "growth_rate": 0.0, "lifespan": 0, diff --git a/src/generated/resources/data/nautec/nautec/bacteria/halobacteria.json b/src/generated/resources/data/nautec/nautec/bacteria/halobacteria.json index 6550439..e23a7fc 100644 --- a/src/generated/resources/data/nautec/nautec/bacteria/halobacteria.json +++ b/src/generated/resources/data/nautec/nautec/bacteria/halobacteria.json @@ -1,6 +1,7 @@ { "type": "nautec:simple", "stats": { + "colony_size": 0.0, "color": -6912, "growth_rate": 0.0, "lifespan": 0, diff --git a/src/generated/resources/data/nautec/nautec/bacteria/methanogens.json b/src/generated/resources/data/nautec/nautec/bacteria/methanogens.json index 49a730c..82c2146 100644 --- a/src/generated/resources/data/nautec/nautec/bacteria/methanogens.json +++ b/src/generated/resources/data/nautec/nautec/bacteria/methanogens.json @@ -1,6 +1,7 @@ { "type": "nautec:simple", "stats": { + "colony_size": 0.0, "color": -1328403, "growth_rate": 0.0, "lifespan": 0, diff --git a/src/generated/resources/data/nautec/nautec/bacteria/thermophiles.json b/src/generated/resources/data/nautec/nautec/bacteria/thermophiles.json index c58cc99..3d5847a 100644 --- a/src/generated/resources/data/nautec/nautec/bacteria/thermophiles.json +++ b/src/generated/resources/data/nautec/nautec/bacteria/thermophiles.json @@ -1,6 +1,7 @@ { "type": "nautec:simple", "stats": { + "colony_size": 0.0, "color": -65536, "growth_rate": 0.0, "lifespan": 0, diff --git a/src/main/java/com/portingdeadmods/nautec/content/bacteria/BacteriaStats.java b/src/main/java/com/portingdeadmods/nautec/content/bacteria/BacteriaStats.java index 7a2aef0..1ac197e 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/bacteria/BacteriaStats.java +++ b/src/main/java/com/portingdeadmods/nautec/content/bacteria/BacteriaStats.java @@ -11,6 +11,7 @@ import net.minecraft.network.codec.ByteBufCodecs; import net.minecraft.network.codec.StreamCodec; import net.minecraft.world.item.Item; +import net.neoforged.neoforge.network.codec.NeoForgeStreamCodecs; import static com.portingdeadmods.nautec.NTConfig.*; @@ -35,7 +36,7 @@ public record BacteriaStats(Item resource, ).apply(instance, BacteriaStats::new) ); - public static final StreamCodec STREAM_CODEC = StreamCodec.composite( + public static final StreamCodec STREAM_CODEC = NeoForgeStreamCodecs.composite( CodecUtils.ITEM_STREAM_CODEC, BacteriaStats::resource, ByteBufCodecs.FLOAT, diff --git a/src/main/java/com/portingdeadmods/nautec/content/items/PetriDishItem.java b/src/main/java/com/portingdeadmods/nautec/content/items/PetriDishItem.java index 096e12c..d842af4 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/items/PetriDishItem.java +++ b/src/main/java/com/portingdeadmods/nautec/content/items/PetriDishItem.java @@ -28,11 +28,11 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List bacteriaType = stack.get(NTDataComponents.BACTERIA).bacteria(); Bacteria bacteria = BacteriaHelper.getBacteria(context.registries(), bacteriaType); if (bacteria != null) { - tooltipComponents.add(Component.literal("Name: ").append(Utils.registryTranslation(bacteriaType)).withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(Component.literal("Name: ").append(Utils.registryTranslation(bacteriaType)).withStyle(ChatFormatting.WHITE)); if (bacteriaType != NTBacterias.EMPTY) { MutableComponent statsCaption = Component.literal("Stats: "); if (Boolean.TRUE.equals(stack.get(NTDataComponents.ANALYZED))) { - tooltipComponents.add(statsCaption.withStyle(ChatFormatting.GRAY)); + tooltipComponents.add(statsCaption.withStyle(ChatFormatting.WHITE)); for (Component tooltipComponent : bacteria.stats().statsTooltip()) { tooltipComponents.add(Component.literal(" ".repeat(2)).append(tooltipComponent).withStyle(ChatFormatting.GRAY)); } diff --git a/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java b/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java index 13d1c10..db2066b 100644 --- a/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java +++ b/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java @@ -7,12 +7,14 @@ import com.portingdeadmods.nautec.registries.NTFluids; import com.portingdeadmods.nautec.utils.Utils; import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.registries.NeoForgeRegistries; import java.util.function.Supplier; import static com.portingdeadmods.nautec.registries.NTItems.*; +import static com.portingdeadmods.nautec.registries.NTBacterias.*; public class EnUsProvider extends AbstractModonomiconLanguageProvider { public EnUsProvider(PackOutput output, ModonomiconLanguageProvider cacheProvider) { @@ -151,10 +153,12 @@ protected void addTranslations() { add("nautec.tool.disabled", "Shift + Right Click to Enable"); // Bacteria - add("nautec:cyanobacteria", "Cyanobacteria"); - add("nautec:halobacteria", "Halobacteria"); - add("nautec:thermophiles", "Thermophiles"); - add("nautec:methanogens", "Methanogens"); + addBacteria(METHANOGENS, "Methanogens"); + addBacteria(THERMOPHILES, "Thermophiles"); + addBacteria(HALOBACTERIA, "Halobacteria"); + addBacteria(CYANOBACTERIA, "Cyanobacteria / Blue-Green algae"); + addBacteria(EMPTY, "Empty"); + } private void addFluidType(Supplier fluidType, String val) { @@ -169,6 +173,10 @@ private void addItem(String key, String val) { add("item.nautec." + key, val); } + private void addBacteria(ResourceKey key, String val) { + add(key.registry().getPath() + "." + key.location().getNamespace() + "." + key.location().getPath(), val); + } + private void addBlock(String key, String val) { add("block.nautec." + key, val); } diff --git a/src/main/java/com/portingdeadmods/nautec/utils/RNGUtils.java b/src/main/java/com/portingdeadmods/nautec/utils/RNGUtils.java index 71969cf..2ab417c 100644 --- a/src/main/java/com/portingdeadmods/nautec/utils/RNGUtils.java +++ b/src/main/java/com/portingdeadmods/nautec/utils/RNGUtils.java @@ -69,5 +69,6 @@ public static float biasedInRange(float rangeStart, float rangeEnd, float bias) } else if (bias > 0) { return uniformRandFloat(left * (1 - absBias), right) + middlePoint; } + return uniformRandFloat(left, right) + middlePoint; } }