Needs more sunscreen

- Fixed uv issues on the fluid tank
- Tweaked frogport sounds
This commit is contained in:
simibubi 2025-01-06 22:57:29 +01:00
parent 81c2975401
commit c4b38ba32f
58 changed files with 121 additions and 70 deletions

View file

@ -29,7 +29,7 @@ jei_version = 15.10.0.39
curios_minecraft_version = 1.20.1
curios_version = 5.3.1
catnip_version = 0.8.41
ponder_version = 0.8.12
ponder_version = 0.8.14
mixin_extras_version = 0.4.1
cc_tweaked_enable = true

View file

@ -1,4 +1,4 @@
// 1.20.1 2025-01-05T12:20:44.8131117 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.20.1 2025-01-06T22:46:25.6513213 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
@ -1891,10 +1891,50 @@ a126a50454ea449e66c6f6e36eb96bff96652c92 assets/create/models/item/brown_table_c
f5ff4e2ed2ea2e43b6d02f6a95ba02b2e4b611dc assets/create/models/item/calcite_pillar.json
cc2692f7964f4266ecf00fcab176b1ef0b78673f assets/create/models/item/cardboard.json
607272f2b906fdffd46677d47a4e6ecb94184eff assets/create/models/item/cardboard_block.json
39eadb54cec52d9e2a087fc71ef83341688f2781 assets/create/models/item/cardboard_boots.json
d6a3f139fca5ac6aff94d11d75fe239283bb4a09 assets/create/models/item/cardboard_chestplate.json
82236ea8e939c46f0d2c9142336190eca2a0425e assets/create/models/item/cardboard_helmet.json
416a4d33a2b3b1921285f96436853dd7690447ac assets/create/models/item/cardboard_leggings.json
70ab4eb53188efef1a157823ce90e5fd09e35d3c assets/create/models/item/cardboard_boots.json
5c67ce75ffe3f5c9a32877ffdb4005b2a44d6483 assets/create/models/item/cardboard_boots_amethyst_trim.json
2027e70e42e1c931537e591c51b1f2d1aed6833c assets/create/models/item/cardboard_boots_copper_trim.json
881e17e4d8b2be53403833ee262a7a17040695bd assets/create/models/item/cardboard_boots_diamond_trim.json
ae9617e768f8a711d932a5137bd7946c7bb1fbe3 assets/create/models/item/cardboard_boots_emerald_trim.json
62dbafe3a1493be7d46270168e57ff1f866bc669 assets/create/models/item/cardboard_boots_gold_trim.json
dcdc125780505d55bf76302fe982b23083c08845 assets/create/models/item/cardboard_boots_iron_trim.json
86a5435fcf899530bd1caa3fdf83e1dee337f22d assets/create/models/item/cardboard_boots_lapis_trim.json
527602bacf19e6ddb40023e1ad9fd532d96699ed assets/create/models/item/cardboard_boots_netherite_trim.json
bf4ec4f542e5d96ca9b6b90e298526acaa8cb8b9 assets/create/models/item/cardboard_boots_quartz_trim.json
d0a89aae893a45b14173f2f104dc0bb72d14516e assets/create/models/item/cardboard_boots_redstone_trim.json
169470769f90bb6fa0e503c78d8dde4bf63c0e7f assets/create/models/item/cardboard_chestplate.json
37ba0d5584aabd317e984d46e2e56622c10c74d0 assets/create/models/item/cardboard_chestplate_amethyst_trim.json
e50df07949d1a0a7e54e5b1635827adf8c250583 assets/create/models/item/cardboard_chestplate_copper_trim.json
1b82a900bb783a55a32d308fbec4c103981ca0ea assets/create/models/item/cardboard_chestplate_diamond_trim.json
90f5afe6a3e8292a37814ae6b8d1ca78bf1279b7 assets/create/models/item/cardboard_chestplate_emerald_trim.json
84ac8525c149e6f630fa02ca53d1e0a0b5f55b3e assets/create/models/item/cardboard_chestplate_gold_trim.json
6327a6514a3c19e9faf31c5388103e1e8cc7d01c assets/create/models/item/cardboard_chestplate_iron_trim.json
0df84176624b1cb081f8bff881156fbe530fda43 assets/create/models/item/cardboard_chestplate_lapis_trim.json
f27591c2befb21f6aa944bd2f54e7c4f58833917 assets/create/models/item/cardboard_chestplate_netherite_trim.json
3ace2f1c1a773d5d9d2b4f3d6c93f742d9bd971d assets/create/models/item/cardboard_chestplate_quartz_trim.json
9e74713fbdc8d90697f264562316f991de51d49e assets/create/models/item/cardboard_chestplate_redstone_trim.json
0b46dc6ac222fcf998100f1656047058fb8ef1ee assets/create/models/item/cardboard_helmet.json
61fad07fcc7da51ed9806938c7c1d930481015d2 assets/create/models/item/cardboard_helmet_amethyst_trim.json
c185e1b969ffb78df3d956a5907486a5abe81d55 assets/create/models/item/cardboard_helmet_copper_trim.json
b5ecea23091e2fa7d0b004a73a210ec4cf970035 assets/create/models/item/cardboard_helmet_diamond_trim.json
1b908f938a492f1faddf7f47e44f99dd0e0cc700 assets/create/models/item/cardboard_helmet_emerald_trim.json
f7096241733b0623eade076fcc536c0a3dd9f252 assets/create/models/item/cardboard_helmet_gold_trim.json
079c0ea69a5c8a7d1bb2e1bdd23ccc9c92e036d5 assets/create/models/item/cardboard_helmet_iron_trim.json
4db478f4669c26edef502b87be277be314933cab assets/create/models/item/cardboard_helmet_lapis_trim.json
ab46809613299865e33dcca39df597a239174df8 assets/create/models/item/cardboard_helmet_netherite_trim.json
03d4eb863c7b4cfc60a81b270a569440f0c62c85 assets/create/models/item/cardboard_helmet_quartz_trim.json
2703a1c5c65fe5c74c03bfe8ab6acfc4e5849cf9 assets/create/models/item/cardboard_helmet_redstone_trim.json
9987b29466b2a83ef25c66f51086b26ccd2c5a5b assets/create/models/item/cardboard_leggings.json
6a98f395678073c3ec0c09556b38cc9ac9e63492 assets/create/models/item/cardboard_leggings_amethyst_trim.json
5e932da44be1022af8c97061caca61a97c99b6d6 assets/create/models/item/cardboard_leggings_copper_trim.json
e010c6af3e4c3c5cba26491c84c2c73c3c9386c7 assets/create/models/item/cardboard_leggings_diamond_trim.json
6f7a3ed21abf915f5803922db3a15fb6210162c6 assets/create/models/item/cardboard_leggings_emerald_trim.json
8176633be5a2ea548fa39df1d875a29851a7b091 assets/create/models/item/cardboard_leggings_gold_trim.json
56254db2e5432386b4de1ab00603f72255a8aa61 assets/create/models/item/cardboard_leggings_iron_trim.json
ca37276063d58483994ab51e3f72ef20521902c2 assets/create/models/item/cardboard_leggings_lapis_trim.json
55dfc8af30c392b0a70390d90c4239aba011d0ac assets/create/models/item/cardboard_leggings_netherite_trim.json
3f7d0d84790570dd92bb83071d6ecfddadce047d assets/create/models/item/cardboard_leggings_quartz_trim.json
47963712e6a470c5d14d7ea1bc8fff2a0553267b assets/create/models/item/cardboard_leggings_redstone_trim.json
123f7b8f5129e07beead05846744ff06161ec7a1 assets/create/models/item/cardboard_package_10x12.json
4f22bc19ebf19be0efc32b5d2fe449349e6f5b2f assets/create/models/item/cardboard_package_10x8.json
599d305569d025d8771993d0b56a377f910e2a95 assets/create/models/item/cardboard_package_12x10.json
@ -4788,5 +4828,6 @@ dafa3bdb72fef5e6c0201c05846db3f2b214e587 data/minecraft/tags/blocks/stairs.json
1ac7c46815461cbec0d4d97f25c085fdc8375dab data/minecraft/tags/items/slabs.json
dafa3bdb72fef5e6c0201c05846db3f2b214e587 data/minecraft/tags/items/stairs.json
11427a72e181857e22ec37a22462bc652e127cc5 data/minecraft/tags/items/trapdoors.json
15d3621abbef2048a7c258d410e40d9d87e55dd7 data/minecraft/tags/items/trimmable_armor.json
2bcba05954ff7bc4cf9cc520478083da9973ec76 data/minecraft/tags/items/walls.json
71aef080a900d9e86818cf579438c3d826d6567e data/quark/tags/blocks/non_double_door.json

View file

@ -1,2 +1,2 @@
// 1.20.1 2025-01-05T12:20:44.8111168 Create's Custom Sounds
b55aef763ad0b3df0d27e53c2a4c656c942cfa7a assets/create/sounds.json
// 1.20.1 2025-01-06T22:46:25.6503343 Create's Custom Sounds
1305ab16efe6b554f5c852de0d52adaf419c4f76 assets/create/sounds.json

View file

@ -65,4 +65,4 @@
"textures": {
"layer0": "create:item/cardboard_boots"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_amethyst"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_copper"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_diamond"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_emerald"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_gold"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_iron"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_lapis"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_netherite"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_quartz"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_boots",
"layer1": "create:trims/items/card_boots_trim_redstone"
}
}
}

View file

@ -65,4 +65,4 @@
"textures": {
"layer0": "create:item/cardboard_chestplate"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_amethyst"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_copper"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_diamond"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_emerald"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_gold"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_iron"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_lapis"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_netherite"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_quartz"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_chestplate",
"layer1": "create:trims/items/card_chestplate_trim_redstone"
}
}
}

View file

@ -65,4 +65,4 @@
"textures": {
"layer0": "create:item/cardboard_helmet"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_amethyst"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_copper"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_diamond"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_emerald"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_gold"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_iron"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_lapis"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_netherite"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_quartz"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_helmet",
"layer1": "create:trims/items/card_helmet_trim_redstone"
}
}
}

View file

@ -65,4 +65,4 @@
"textures": {
"layer0": "create:item/cardboard_leggings"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_amethyst"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_copper"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_diamond"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_emerald"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_gold"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_iron"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_lapis"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_netherite"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_quartz"
}
}
}

View file

@ -4,4 +4,4 @@
"layer0": "create:item/cardboard_leggings",
"layer1": "create:trims/items/card_leggings_trim_redstone"
}
}
}

View file

@ -292,8 +292,8 @@
"frogport_open": {
"sounds": [
{
"type": "file",
"name": "create:frogport_open"
"type": "event",
"name": "minecraft:entity.warden.tendril_clicks"
}
],
"subtitle": "create.subtitle.frogport_open"

View file

@ -5,4 +5,4 @@
"create:cardboard_leggings",
"create:cardboard_boots"
]
}
}

View file

@ -138,6 +138,7 @@ public class AllSoundEvents {
.build(),
FROGPORT_OPEN = create("frogport_open").subtitle("Frogport opens")
.playExisting(SoundEvents.WARDEN_TENDRIL_CLICKS, 1f, 2f)
.category(SoundSource.BLOCKS)
.build(),

View file

@ -21,6 +21,8 @@ import net.minecraft.core.particles.BlockParticleOption;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.Mth;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntity;
@ -121,21 +123,26 @@ public class FrogportBlockEntity extends PackagePortBlockEntity implements IHave
animationProgress.tickChaser();
float value = animationProgress.getValue();
if (currentlyDepositing) {
if (!level.isClientSide()) {
if (animationProgress.getValue() > 0.5 && animatedPackage != null) {
if (value > 0.5 && animatedPackage != null) {
if (target == null
|| !target.depositImmediately() && !target.export(level, worldPosition, animatedPackage, false))
drop(animatedPackage);
animatedPackage = null;
}
} else {
if (animationProgress.getValue() > 0.7)
if (value > 0.7 && animatedPackage != null)
animatedPackage = null;
if (animationProgress.getValue(0) < 0.2 && value > 0.2) {
Vec3 v = target.getExactTargetLocation(this, level, worldPosition);
level.playLocalSound(v.x, v.y, v.z, SoundEvents.CHAIN_STEP, SoundSource.BLOCKS, 0.25f, 1.2f, false);
}
}
}
if (animationProgress.getValue() < 1)
if (value < 1)
return;
anticipationProgress.startWithValue(0);
@ -169,6 +176,8 @@ public class FrogportBlockEntity extends PackagePortBlockEntity implements IHave
currentlyDepositing = deposit;
if (level != null && level.isClientSide()) {
sounds.open(level, worldPosition);
if (currentlyDepositing) {
sounds.depositPackage(level, worldPosition);

View file

@ -16,13 +16,13 @@ public class FrogportSounds {
AllSoundEvents.FROGPORT_CATCH_2, AllSoundEvents.FROGPORT_CATCH_3, AllSoundEvents.FROGPORT_CATCH_4);
public void open(Level level, BlockPos pos) {
AllSoundEvents.FROGPORT_OPEN.playAt(level, Vec3.atCenterOf(pos), 1, 1, false);
AllSoundEvents.FROGPORT_OPEN.playAt(level, Vec3.atCenterOf(pos), 0.125f, 1, false);
}
public void close(Level level, BlockPos pos) {
if (!isPlayerNear(pos))
return;
AllSoundEvents.FROGPORT_CLOSE.playAt(level, Vec3.atCenterOf(pos), 0.5f, 1.25f + level.random.nextFloat() * 0.25f,
AllSoundEvents.FROGPORT_CLOSE.playAt(level, Vec3.atCenterOf(pos), 1.0f, 1.25f + level.random.nextFloat() * 0.25f,
true);
}

View file

@ -15,7 +15,7 @@
"to": [16, 16, 12],
"faces": {
"east": {"uv": [4, 0, 16, 12], "texture": "#1"},
"south": {"uv": [0, 0, 1, 12], "texture": "#1"},
"south": {"uv": [15, 0, 16, 12], "texture": "#1"},
"west": {"uv": [0, 0, 12, 12], "texture": "#1"}
}
},
@ -44,7 +44,7 @@
"faces": {
"north": {"uv": [0, 0, 12, 12], "texture": "#1"},
"south": {"uv": [4, 0, 16, 12], "texture": "#1"},
"west": {"uv": [15, 0, 16, 12], "texture": "#1"}
"west": {"uv": [0, 0, 1, 12], "texture": "#1"}
}
},
{

View file

@ -12,7 +12,7 @@
"from": [0, 0, 4],
"to": [1, 16, 16],
"faces": {
"north": {"uv": [0, 0, 1, 16], "texture": "#1"},
"north": {"uv": [15, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 12, 16], "texture": "#1"},
"west": {"uv": [4, 0, 16, 16], "texture": "#1"}
}
@ -41,7 +41,7 @@
"to": [12, 16, 16],
"faces": {
"north": {"uv": [4, 0, 16, 16], "texture": "#1"},
"east": {"uv": [15, 0, 16, 16], "texture": "#1"},
"east": {"uv": [0, 0, 1, 16], "texture": "#1"},
"south": {"uv": [0, 0, 12, 16], "texture": "#1"}
}
}

View file

@ -16,7 +16,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 16, 12], "texture": "#1"},
"east": {"uv": [0, 4, 1, 12], "texture": "#1"},
"east": {"uv": [15, 4, 16, 12], "texture": "#1"},
"south": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},
@ -47,7 +47,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"east": {"uv": [4, 4, 16, 12], "texture": "#1"},
"south": {"uv": [16, 4, 15, 12], "texture": "#1"},
"south": {"uv": [1, 4, 0, 12], "texture": "#1"},
"west": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},

View file

@ -17,7 +17,7 @@
"faces": {
"north": {"uv": [0, 4, 12, 12], "texture": "#1"},
"south": {"uv": [4, 4, 16, 12], "texture": "#1"},
"west": {"uv": [0, 4, 1, 12], "texture": "#1"}
"west": {"uv": [15, 4, 16, 12], "texture": "#1"}
}
},
{
@ -46,7 +46,7 @@
"to": [16, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [15, 4, 16, 12], "texture": "#1"},
"north": {"uv": [0, 4, 1, 12], "texture": "#1"},
"east": {"uv": [0, 4, 12, 12], "texture": "#1"},
"west": {"uv": [4, 4, 16, 12], "texture": "#1"}
}

View file

@ -15,7 +15,7 @@
"to": [1, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [0, 4, 1, 12], "texture": "#1"},
"north": {"uv": [15, 4, 16, 12], "texture": "#1"},
"east": {"uv": [0, 4, 12, 12], "texture": "#1"},
"west": {"uv": [4, 4, 16, 12], "texture": "#1"}
}
@ -47,7 +47,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 16, 12], "texture": "#1"},
"east": {"uv": [15, 4, 16, 12], "texture": "#1"},
"east": {"uv": [0, 4, 1, 12], "texture": "#1"},
"south": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},