mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-05-19 20:13:53 +02:00
e5c6ca157c
commit 053dd09df6c426ab5e570f42a1edb5df3d0fbd01 Merge: 6d1e1c71decc645eba
Author: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue May 9 18:22:42 2023 +0200 Merge branch '1.18/api' of https://github.com/Layers-of-Railways/Create into pr/4692 commitecc645eba7
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Tue May 9 11:24:11 2023 +0100 Implemented support for creating and removing individual blockstate models commit 6d1e1c71de7ce20f6fd9fc8ed4ed9bdd1072829a Author: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue May 9 12:16:54 2023 +0200 Less error logging when migrating old worlds commit205e47352e
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 21:02:19 2023 -0700 Fix up ItemOutline commit6cf204f6af
Merge:fe049bc77
2e3c906ce
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:28:56 2023 -0700 Merge remote-tracking branch 'upstream/mc1.18/dev' into 1.18/api # Conflicts: # src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageCouplingRenderer.java commitfe049bc771
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:26:16 2023 -0700 Revert "Revert "Rewrite outline buffering"" This reverts commit726bfaf0
commit435b4c1c16
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:20:23 2023 -0700 Clean up last bits of upside down rendering commit662da6bab1
Merge:122fe77af
d83285e8a
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:16:32 2023 -0700 Merge remote-tracking branch 'origin/1.18/api' into 1.18/api # Conflicts: # src/main/java/com/simibubi/create/content/logistics/trains/StandardBogeyRenderer.java commit122fe77afa
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 8 20:15:46 2023 -0700 Fix up upside down rendering commitd83285e8a4
Merge:00e953a58
cdb0ad210
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Sun May 7 07:02:18 2023 -0700 Merge pull request #3 from Layers-of-Railways/1.18/bogey-api Cleanup cycle groups and unused imports commitcdb0ad210b
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 10:15:47 2023 +0100 Fixed merge artifact commit457d5f33ed
Merge:4e4e227a3
00e953a58
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 10:14:07 2023 +0100 Merge remote-tracking branch 'origin/1.18/api' into 1.18/api commit00e953a585
Merge:1e4d5504e
a7a25896c
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Sun May 7 10:13:49 2023 +0100 Merge pull request #2 from Rabbitminers/mc1.18/dev Added Return Values and Small Cleanup commita7a25896c1
Merge:7622128be
1e4d5504e
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Sun May 7 10:13:40 2023 +0100 Merge branch '1.18/api' into mc1.18/dev commit4e4e227a35
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 10:10:30 2023 +0100 Cleanup to cycle groups commitaa94fc97d1
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun May 7 09:50:50 2023 +0100 Removed unused import of Railways commit7622128bec
Merge:81eeadb85
d52065808
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Sun May 7 09:11:59 2023 +0100 Merge branch 'Layers-of-Railways:mc1.18/dev' into mc1.18/dev commit1e4d5504ee
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat May 6 18:03:39 2023 -0700 Don't revert non-buggy changes commitb306cf2124
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat May 6 18:00:59 2023 -0700 Take materials into consideration when trains pathfind commitfca02ae4bf
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat May 6 10:25:51 2023 -0700 Add materials to track graph commit726bfaf0b5
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 21:16:49 2023 -0700 Revert "Rewrite outline buffering" This reverts commitd4106d545b
. commit171897bed2
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 20:55:25 2023 -0700 Fix up style cycling commitcbd0cf20da
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 07:32:06 2023 -0700 clean up nether portal carriage handling commitd556f08876
Author: techno-sam <linux.techno.sam@gmail.com> Date: Fri May 5 07:06:02 2023 -0700 upside down bogeys work in nether portals fixed coupling anchor offsets commitda26c0ccbf
Author: techno-sam <linux.techno.sam@gmail.com> Date: Thu May 4 09:32:53 2023 -0700 working on upside down bogeys in nether portals commit81eeadb853
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon May 1 16:15:28 2023 +0100 Small cleanup commitc7e9df973c
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon May 1 16:13:51 2023 +0100 Fixed issue raised in #1 commit2f285b6eb7
Author: techno-sam <linux.techno.sam@gmail.com> Date: Mon May 1 08:13:27 2023 -0700 add data gen commit206de01311
Merge:e91753a33
6564f4fa7
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Mon May 1 06:49:21 2023 -0700 Merge pull request #1 from Rabbitminers/mc1.18/dev Bogey API commit6564f4fa73
Merge:e5d759582
e91753a33
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Mon May 1 10:40:32 2023 +0100 Merge branch '1.18/api' into mc1.18/dev commite5d7595822
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon May 1 10:09:03 2023 +0100 Connected Custom Bogey Particle Types To CarriageParticles commite91753a33c
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sun Apr 30 19:51:26 2023 -0700 Fix up some problems commit9815f1490f
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:12:43 2023 +0100 Implemented default data when shifting styles commitda30e78815
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:12:14 2023 +0100 Added Particles To Bogey Style (And Respective Builder) commit08c000b8ba
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:01:19 2023 +0100 Added Backup Rendering If A Size Is Not Present commit2b76e8d7b3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 21:00:40 2023 +0100 Added Common Renderer To Remove Function commit411ec36f57
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:59:50 2023 +0100 Added Display Name To Standard Bogey Style commit112306d5d4
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:59:30 2023 +0100 Displayed new style name when changing betweeen them commit5634670b27
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:06:00 2023 +0100 General Cleanup commit0f7a8b7b24
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:05:50 2023 +0100 Implemented Changes To Remaining Classes commit8aedc00f96
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:02:06 2023 +0100 Removed Bogey Style Handling From Registrate commitedf8079abf
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:01:40 2023 +0100 Removed Unused Registry Handling commit6a185c4e72
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:01:16 2023 +0100 Refactored Bogey Sizes commite10d07ddc3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 30 20:01:00 2023 +0100 Overhauled Bogey Style commit74d98a2ad5
Merge:e629d02f5
4ebcf8201
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Sun Apr 23 07:16:33 2023 -0700 Merge branch 'Creators-of-Create:mc1.18/dev' into 1.18/api commite629d02f50
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sun Apr 9 07:18:22 2023 -0700 Track API Clean up code a bit commitd9ce6ce995
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sun Apr 9 07:14:46 2023 -0700 Track API? Fix placement commit7fbf08ba54
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat Apr 8 11:11:24 2023 -0700 Track API? Fix up some placement issues commit35644f1434
Author: techno-sam <linux.techno.sam@gmail.com> Date: Sat Apr 8 08:11:13 2023 -0700 Track API maybe? Datagen Seems to be working commitf7c56b867a
Author: techno-sam <linux.techno.sam@gmail.com> Date: Thu Apr 6 21:24:31 2023 -0700 Track API maybe? Fix build - broken generic Not yet tested, but it is progress commit2a59fd7e8a
Author: techno-sam <linux.techno.sam@gmail.com> Date: Thu Apr 6 21:13:54 2023 -0700 Track API maybe? Not yet tested, but it is progress commit5ba30d6a85
Merge:e4e5ac1c4
c2977bbff
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Thu Apr 6 17:10:39 2023 -0700 Merge branch 'Creators-of-Create:mc1.18/dev' into 1.18/api commitd52065808c
Merge:e4e5ac1c4
c2977bbff
Author: techno-sam <77073745+techno-sam@users.noreply.github.com> Date: Thu Apr 6 17:10:26 2023 -0700 Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev commit53240bd42f
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 21:42:29 2023 +0100 Corrected Bogey InteractionResult To Pass commit69326e361a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 21:30:28 2023 +0100 Fixed Default Values When Used Styles Are Removed commit4f176979de
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 19:33:17 2023 +0100 Fixed Carriage Sounds (Again) commit1e80af3303
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 19:27:58 2023 +0100 Refactored Bogey Sizes To Seperate Class commit129be61fee
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 17:20:17 2023 +0100 Fixed Bogey Sound Loading commit2543185a55
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 09:45:23 2023 +0100 Added Bogey Sound Customisation commit1ad5ae9514
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Mon Apr 3 00:44:53 2023 +0100 Added Size Transforms If Size Is Not Available For New Style commit96566b1614
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 23:02:02 2023 +0100 Moved Bogey Style Inside Of Bogey Data And Implemented Bogey Data Communication commiteedd984738
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:53:55 2023 +0100 Fixed Large Bogey Size commit68ca0974c6
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:47:58 2023 +0100 Implemented Style Cycling & Default Values commita55ba4267a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:46:15 2023 +0100 Implemented renderer instance creator commit43523302c2
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sun Apr 2 16:45:33 2023 +0100 Removed Unused Standard Bogey Instance commit773e084422
Merge:0c0b5a1ed
d1e1f7ec5
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Apr 1 18:50:15 2023 +0100 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev # Conflicts: # src/main/java/com/simibubi/create/AllBogeyStyles.java # src/main/java/com/simibubi/create/content/logistics/trains/BogeyTileEntityRenderer.java # src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java # src/main/java/com/simibubi/create/content/logistics/trains/entity/CarriageContraptionEntityRenderer.java # src/main/java/com/simibubi/create/content/logistics/trains/entity/StandardBogeyInstance.java # src/main/java/com/simibubi/create/foundation/data/BogeyStyleBuilder.java commit0c0b5a1ed6
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Apr 1 18:39:58 2023 +0100 Linked Style Registry To Bogey Blocks commit71f839ee51
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Apr 1 18:39:03 2023 +0100 Replaced size boolean with direct use of size enum commit50ff081704
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 30 18:47:13 2023 +0100 Added Resource Location To NBT helper methods commitd1e1f7ec5a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 30 18:47:13 2023 +0100 Re-worked BogeyStyles commitda593fccb1
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 30 18:46:02 2023 +0100 Refactored IBogeyBlock to AbstractBogeyBlock and extracted relevant StandardBogeyBlock implementations commit17432c9113
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Sat Mar 25 10:20:50 2023 +0000 Fixed Incorrect Registry Loading commitc7d899369a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:44:03 2023 +0000 Registered Registers commit6d862290d7
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:43:23 2023 +0000 Added BogeyStyleBuilder To Registrate commit3dfb9e3b3b
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:43:08 2023 +0000 Implemented AllBogeyStyles commitc9e71b462d
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:42:56 2023 +0000 Created BogeyStyleBuilder commita90977d642
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:42:25 2023 +0000 Created AllRegistries and BogeyStyle Registry commit154d455f3f
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Fri Mar 24 23:41:56 2023 +0000 Added BogeyStyle Wrapper commitdfb7640bfc
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:50:41 2023 +0000 Removed left over logging statement commit9920536cc3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:50:18 2023 +0000 Implemented Secondary Shaft To Large Renderer commit6cd40cc6f9
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:49:56 2023 +0000 Prevented Overwrite When Using Two BlockStates Of The Same Type With Different Properties commit06fb901144
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:39:11 2023 +0000 Implemented Common Rendering For StandardBogeyRenderer commit435b0f8266
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:38:40 2023 +0000 Added Common Renderer commit96a0623dab
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 18:38:29 2023 +0000 Implemented BlockState Models For Rendering commit469d9d592b
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:42:28 2023 +0000 Added Standard Bogey Instance (Might be redundant) commit2661d260d8
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:42:06 2023 +0000 Refactored Changes To Existing Methods commit9ded16fbab
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:41:15 2023 +0000 Integrated BogeyRenderer To BogeyInstance (Also Corrected Rendering In Contraption) commit4a82fcbca1
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:40:13 2023 +0000 Implemented Changes To StandardBogeyBlock commit7238fb93f3
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Thu Mar 23 17:39:51 2023 +0000 Added Renderer To IBogeyBlock commitded4c1f613
Merge:91727cc84
3c02fe6ec
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Wed Mar 22 17:03:37 2023 +0000 Merge remote-tracking branch 'origin/mc1.18/dev' into mc1.18/dev commit91727cc84a
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Wed Mar 22 17:03:28 2023 +0000 Implemented Model Data Initializer to StandardBogeyRenderer commit6d98a1f469
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Wed Mar 22 17:03:00 2023 +0000 Added Contraption Model Instance Initializer commit3c02fe6ecc
Author: Rabbitminers <79579164+Rabbitminers@users.noreply.github.com> Date: Tue Mar 21 22:45:34 2023 +0000 Added missing render type check commit6672c49649
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Tue Mar 21 22:37:36 2023 +0000 Re-created standard bogey with test api commita8a9491fa0
Author: Rabbitminers <Rabbitminers2.0@gmail.com> Date: Tue Mar 21 22:34:54 2023 +0000 Implemented Proof Of Concept Generic Bogey Renderer commite4e5ac1c40
Author: SpottyTheTurtle <69260662+SpottyTheTurtle@users.noreply.github.com> Date: Sat Mar 11 21:34:59 2023 +0000 init
311 lines
10 KiB
Java
311 lines
10 KiB
Java
package com.simibubi.create.content.logistics.trains.entity;
|
|
|
|
import com.simibubi.create.AllSoundEvents;
|
|
import com.simibubi.create.AllSoundEvents.SoundEntry;
|
|
import com.simibubi.create.content.logistics.trains.entity.Carriage.DimensionalCarriageEntity;
|
|
import com.simibubi.create.foundation.utility.Couple;
|
|
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
|
|
import com.simibubi.create.foundation.utility.animation.LerpedFloat.Chaser;
|
|
|
|
import net.minecraft.client.Minecraft;
|
|
import net.minecraft.client.resources.sounds.AbstractTickableSoundInstance;
|
|
import net.minecraft.sounds.SoundEvent;
|
|
import net.minecraft.sounds.SoundEvents;
|
|
import net.minecraft.sounds.SoundSource;
|
|
import net.minecraft.util.Mth;
|
|
import net.minecraft.world.entity.Entity;
|
|
import net.minecraft.world.phys.Vec3;
|
|
|
|
public class CarriageSounds {
|
|
|
|
CarriageContraptionEntity entity;
|
|
|
|
LerpedFloat distanceFactor;
|
|
LerpedFloat speedFactor;
|
|
LerpedFloat approachFactor;
|
|
LerpedFloat seatCrossfade;
|
|
|
|
LoopingSound minecartEsqueSound;
|
|
LoopingSound sharedWheelSound;
|
|
LoopingSound sharedWheelSoundSeated;
|
|
LoopingSound sharedHonkSound;
|
|
|
|
Couple<SoundEvent> bogeySounds;
|
|
SoundEvent closestBogeySound;
|
|
|
|
boolean arrived;
|
|
|
|
int tick;
|
|
int prevSharedTick;
|
|
|
|
public CarriageSounds(CarriageContraptionEntity entity) {
|
|
this.entity = entity;
|
|
bogeySounds = entity.getCarriage().bogeys.map(bogey ->
|
|
bogey != null && bogey.getStyle() != null ? bogey.getStyle().getSoundType()
|
|
: AllSoundEvents.TRAIN2.getMainEvent());
|
|
closestBogeySound = bogeySounds.getFirst();
|
|
distanceFactor = LerpedFloat.linear();
|
|
speedFactor = LerpedFloat.linear();
|
|
approachFactor = LerpedFloat.linear();
|
|
seatCrossfade = LerpedFloat.linear();
|
|
arrived = true;
|
|
}
|
|
|
|
public void tick(DimensionalCarriageEntity dce) {
|
|
Minecraft mc = Minecraft.getInstance();
|
|
Entity camEntity = mc.cameraEntity;
|
|
if (camEntity == null)
|
|
return;
|
|
|
|
Vec3 leadingAnchor = dce.leadingAnchor();
|
|
Vec3 trailingAnchor = dce.trailingAnchor();
|
|
if (leadingAnchor == null || trailingAnchor == null)
|
|
return;
|
|
|
|
tick++;
|
|
|
|
Vec3 cam = camEntity.getEyePosition();
|
|
Vec3 contraptionMotion = entity.position()
|
|
.subtract(entity.getPrevPositionVec());
|
|
Vec3 combinedMotion = contraptionMotion.subtract(camEntity.getDeltaMovement());
|
|
|
|
Train train = entity.getCarriage().train;
|
|
|
|
if (arrived && contraptionMotion.length() > 0.01f)
|
|
arrived = false;
|
|
if (arrived && entity.carriageIndex == 0)
|
|
train.accumulatedSteamRelease /= 2;
|
|
|
|
arrived |= entity.isStalled();
|
|
|
|
if (entity.carriageIndex == 0)
|
|
train.accumulatedSteamRelease = (float) Math
|
|
.min(train.accumulatedSteamRelease + Math.min(0.5f, Math.abs(contraptionMotion.length() / 10f)), 10);
|
|
|
|
Vec3 toBogey1 = leadingAnchor.subtract(cam);
|
|
Vec3 toBogey2 = trailingAnchor.subtract(cam);
|
|
double distance1 = toBogey1.length();
|
|
double distance2 = toBogey2.length();
|
|
|
|
Couple<CarriageBogey> bogeys = entity.getCarriage().bogeys;
|
|
CarriageBogey relevantBogey = bogeys.get(distance1 > distance2);
|
|
if (relevantBogey == null) {
|
|
relevantBogey = bogeys.getFirst();
|
|
}
|
|
if (relevantBogey != null) {
|
|
closestBogeySound = relevantBogey.getStyle().getSoundType();
|
|
}
|
|
|
|
Vec3 toCarriage = distance1 > distance2 ? toBogey2 : toBogey1;
|
|
double distance = Math.min(distance1, distance2);
|
|
Vec3 soundLocation = cam.add(toCarriage);
|
|
|
|
double dot = toCarriage.normalize()
|
|
.dot(combinedMotion.normalize());
|
|
|
|
speedFactor.chase(contraptionMotion.length(), .25f, Chaser.exp(.05f));
|
|
distanceFactor.chase(Mth.clampedLerp(100, 0, (distance - 3) / 64d), .25f, Chaser.exp(50f));
|
|
approachFactor.chase(Mth.clampedLerp(50, 200, .5f * (dot + 1)), .25f, Chaser.exp(10f));
|
|
seatCrossfade.chase(camEntity.getVehicle() instanceof CarriageContraptionEntity ? 1 : 0, .1f, Chaser.EXP);
|
|
|
|
speedFactor.tickChaser();
|
|
distanceFactor.tickChaser();
|
|
approachFactor.tickChaser();
|
|
seatCrossfade.tickChaser();
|
|
|
|
minecartEsqueSound = playIfMissing(mc, minecartEsqueSound, AllSoundEvents.TRAIN.getMainEvent());
|
|
sharedWheelSound = playIfMissing(mc, sharedWheelSound, closestBogeySound);
|
|
sharedWheelSoundSeated = playIfMissing(mc, sharedWheelSoundSeated, AllSoundEvents.TRAIN3.getMainEvent());
|
|
|
|
float volume = Math.min(Math.min(speedFactor.getValue(), distanceFactor.getValue() / 100),
|
|
approachFactor.getValue() / 300 + .0125f);
|
|
|
|
if (entity.carriageIndex == 0) {
|
|
float v = volume * (1 - seatCrossfade.getValue() * .35f) * .75f;
|
|
if ((3 + tick) % 4 == 0)
|
|
AllSoundEvents.STEAM.playAt(entity.level, soundLocation, v * ((tick + 7) % 8 == 0 ? 0.75f : .45f),
|
|
1.17f, false);
|
|
if (tick % 16 == 0)
|
|
AllSoundEvents.STEAM.playAt(entity.level, soundLocation, v * 1.5f, .8f, false);
|
|
}
|
|
|
|
if (!arrived && speedFactor.getValue() < .002f && train.accumulatedSteamRelease > 1) {
|
|
arrived = true;
|
|
float releaseVolume = train.accumulatedSteamRelease / 10f;
|
|
entity.level.playLocalSound(soundLocation.x, soundLocation.y, soundLocation.z, SoundEvents.LAVA_EXTINGUISH,
|
|
SoundSource.NEUTRAL, .25f * releaseVolume, .78f, false);
|
|
entity.level.playLocalSound(soundLocation.x, soundLocation.y, soundLocation.z,
|
|
SoundEvents.WOODEN_TRAPDOOR_CLOSE, SoundSource.NEUTRAL, .2f * releaseVolume, 1.5f, false);
|
|
AllSoundEvents.STEAM.playAt(entity.level, soundLocation, .75f * releaseVolume, .5f, false);
|
|
}
|
|
|
|
float pitchModifier = ((entity.getId() * 10) % 13) / 36f;
|
|
|
|
volume = Math.min(volume, distanceFactor.getValue() / 800);
|
|
|
|
float pitch = Mth.clamp(speedFactor.getValue() * 2 + .25f, .75f, 1.95f) - pitchModifier;
|
|
// float pitch2 = Mth.clamp(speedFactor.getValue() * 2, 0.75f, 1.25f) - pitchModifier;
|
|
|
|
minecartEsqueSound.setPitch(pitch * 1.5f);
|
|
|
|
volume = Math.min(volume, distanceFactor.getValue() / 1000);
|
|
|
|
for (Carriage carriage : train.carriages) {
|
|
DimensionalCarriageEntity mainDCE = carriage.getDimensionalIfPresent(entity.level.dimension());
|
|
if (mainDCE == null)
|
|
continue;
|
|
CarriageContraptionEntity mainEntity = mainDCE.entity.get();
|
|
if (mainEntity == null)
|
|
continue;
|
|
if (mainEntity.sounds == null)
|
|
mainEntity.sounds = new CarriageSounds(mainEntity);
|
|
mainEntity.sounds.submitSharedSoundVolume(soundLocation, volume);
|
|
if (carriage != entity.getCarriage()) {
|
|
finalizeSharedVolume(0);
|
|
return;
|
|
}
|
|
break;
|
|
}
|
|
|
|
// finalizeSharedVolume(volume);
|
|
// minecartEsqueSound.setLocation(soundLocation);
|
|
// sharedWheelSound.setPitch(pitch2);
|
|
// sharedWheelSound.setLocation(soundLocation);
|
|
// sharedWheelSoundSeated.setPitch(pitch2);
|
|
// sharedWheelSoundSeated.setLocation(soundLocation);
|
|
|
|
if (train.honkTicks == 0) {
|
|
if (sharedHonkSound != null) {
|
|
sharedHonkSound.stopSound();
|
|
sharedHonkSound = null;
|
|
}
|
|
return;
|
|
}
|
|
|
|
train.honkTicks--;
|
|
train.determineHonk(entity.level);
|
|
|
|
if (train.lowHonk == null)
|
|
return;
|
|
|
|
boolean low = train.lowHonk;
|
|
float honkPitch = (float) Math.pow(2, train.honkPitch / 12.0);
|
|
|
|
SoundEntry endSound =
|
|
!low ? AllSoundEvents.WHISTLE_TRAIN_MANUAL_END : AllSoundEvents.WHISTLE_TRAIN_MANUAL_LOW_END;
|
|
SoundEntry continuousSound =
|
|
!low ? AllSoundEvents.WHISTLE_TRAIN_MANUAL : AllSoundEvents.WHISTLE_TRAIN_MANUAL_LOW;
|
|
|
|
if (train.honkTicks == 5)
|
|
endSound.playAt(mc.level, soundLocation, 1, honkPitch, false);
|
|
if (train.honkTicks == 19)
|
|
endSound.playAt(mc.level, soundLocation, .5f, honkPitch, false);
|
|
|
|
sharedHonkSound = playIfMissing(mc, sharedHonkSound, continuousSound.getMainEvent());
|
|
sharedHonkSound.setLocation(soundLocation);
|
|
float fadeout = Mth.clamp((3 - train.honkTicks) / 3f, 0, 1);
|
|
float fadein = Mth.clamp((train.honkTicks - 17) / 3f, 0, 1);
|
|
sharedHonkSound.setVolume(1 - fadeout - fadein);
|
|
sharedHonkSound.setPitch(honkPitch);
|
|
|
|
}
|
|
|
|
private LoopingSound playIfMissing(Minecraft mc, LoopingSound loopingSound, SoundEvent sound) {
|
|
if (loopingSound == null) {
|
|
loopingSound = new LoopingSound(sound, SoundSource.NEUTRAL);
|
|
mc.getSoundManager()
|
|
.play(loopingSound);
|
|
}
|
|
return loopingSound;
|
|
}
|
|
|
|
public void submitSharedSoundVolume(Vec3 location, float volume) {
|
|
Minecraft mc = Minecraft.getInstance();
|
|
minecartEsqueSound = playIfMissing(mc, minecartEsqueSound, AllSoundEvents.TRAIN.getMainEvent());
|
|
sharedWheelSound = playIfMissing(mc, sharedWheelSound, closestBogeySound);
|
|
sharedWheelSoundSeated = playIfMissing(mc, sharedWheelSoundSeated, AllSoundEvents.TRAIN3.getMainEvent());
|
|
|
|
boolean approach = true;
|
|
|
|
if (tick != prevSharedTick) {
|
|
prevSharedTick = tick;
|
|
approach = false;
|
|
} else if (sharedWheelSound.getVolume() > volume)
|
|
return;
|
|
|
|
Vec3 currentLoc = new Vec3(minecartEsqueSound.getX(), minecartEsqueSound.getY(), minecartEsqueSound.getZ());
|
|
Vec3 newLoc = approach ? currentLoc.add(location.subtract(currentLoc)
|
|
.scale(.125f)) : location;
|
|
|
|
minecartEsqueSound.setLocation(newLoc);
|
|
sharedWheelSound.setLocation(newLoc);
|
|
sharedWheelSoundSeated.setLocation(newLoc);
|
|
finalizeSharedVolume(volume);
|
|
}
|
|
|
|
public void finalizeSharedVolume(float volume) {
|
|
float crossfade = seatCrossfade.getValue();
|
|
minecartEsqueSound.setVolume((1 - crossfade * .65f) * volume / 2);
|
|
volume = Math.min(volume, Math.max((speedFactor.getValue() - .25f) / 4 + 0.01f, 0));
|
|
sharedWheelSoundSeated.setVolume(volume * crossfade);
|
|
sharedWheelSound.setVolume(volume * (1 - crossfade) * 1.5f);
|
|
}
|
|
|
|
public void stop() {
|
|
if (minecartEsqueSound != null)
|
|
minecartEsqueSound.stopSound();
|
|
if (sharedWheelSound != null)
|
|
sharedWheelSound.stopSound();
|
|
if (sharedWheelSoundSeated != null)
|
|
sharedWheelSoundSeated.stopSound();
|
|
if (sharedHonkSound != null)
|
|
sharedHonkSound.stopSound();
|
|
}
|
|
|
|
class LoopingSound extends AbstractTickableSoundInstance {
|
|
|
|
protected LoopingSound(SoundEvent p_119606_, SoundSource p_119607_) {
|
|
super(p_119606_, p_119607_);
|
|
attenuation = Attenuation.LINEAR;
|
|
looping = true;
|
|
delay = 0;
|
|
volume = 0.0001f;
|
|
}
|
|
|
|
@Override
|
|
public void tick() {}
|
|
|
|
public void setVolume(float volume) {
|
|
this.volume = volume;
|
|
}
|
|
|
|
@Override
|
|
public float getVolume() {
|
|
return volume;
|
|
}
|
|
|
|
public void setPitch(float pitch) {
|
|
this.pitch = pitch;
|
|
}
|
|
|
|
@Override
|
|
public float getPitch() {
|
|
return pitch;
|
|
}
|
|
|
|
public void setLocation(Vec3 location) {
|
|
x = location.x;
|
|
y = location.y;
|
|
z = location.z;
|
|
}
|
|
|
|
public void stopSound() {
|
|
Minecraft.getInstance()
|
|
.getSoundManager()
|
|
.stop(this);
|
|
}
|
|
|
|
}
|
|
|
|
}
|