-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
9c21368
commit 4face8b
Showing
7 changed files
with
118 additions
and
12 deletions.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
src/generated/resources/assets/armistice/model_elements/hull/null.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
[] |
30 changes: 30 additions & 0 deletions
30
src/generated/resources/data/armistice/model_bones/hull/null.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
[ | ||
{ | ||
"autouv": 0, | ||
"children": [ | ||
{ | ||
"autouv": 0, | ||
"export": true, | ||
"mirror_uv": false, | ||
"name": "ordnance1", | ||
"origin": [ | ||
0.0, | ||
0.0, | ||
0.0 | ||
], | ||
"uuid": "045a875f-65a0-d37e-651f-ebd1cc54b12b", | ||
"visibility": true | ||
} | ||
], | ||
"export": true, | ||
"mirror_uv": false, | ||
"name": "root", | ||
"origin": [ | ||
0.0, | ||
1.0, | ||
4.0 | ||
], | ||
"uuid": "b9b05ff0-47ee-87bf-8e04-e83d5046d880", | ||
"visibility": true | ||
} | ||
] |
32 changes: 32 additions & 0 deletions
32
src/main/java/symbolics/division/armistice/client/sound/CockpitSoundInstance.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
package symbolics.division.armistice.client.sound; | ||
|
||
import net.minecraft.client.resources.sounds.SimpleSoundInstance; | ||
import net.minecraft.client.resources.sounds.TickableSoundInstance; | ||
import net.minecraft.sounds.SoundSource; | ||
import net.minecraft.util.RandomSource; | ||
import net.minecraft.world.entity.player.Player; | ||
import net.neoforged.api.distmarker.Dist; | ||
import net.neoforged.api.distmarker.OnlyIn; | ||
import symbolics.division.armistice.mecha.MechaEntity; | ||
import symbolics.division.armistice.registry.ArmisticeSoundEventRegistrar; | ||
|
||
@OnlyIn(Dist.CLIENT) | ||
public class CockpitSoundInstance extends SimpleSoundInstance implements TickableSoundInstance { | ||
private final MechaEntity mecha; | ||
private final Player pilot; | ||
|
||
public CockpitSoundInstance(MechaEntity mecha, Player pilot, float volume, float pitch, RandomSource random) { | ||
super(ArmisticeSoundEventRegistrar.ENTITY$MECHA$COCKPIT.getLocation(), SoundSource.HOSTILE, volume, pitch, random, true, 0, Attenuation.NONE, 0, 0, 0, true); | ||
this.mecha = mecha; | ||
this.pilot = pilot; | ||
} | ||
|
||
@Override | ||
public boolean isStopped() { | ||
return !mecha.hasPassenger(pilot); | ||
} | ||
|
||
@Override | ||
public void tick() { | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/main/resources/assets/armistice/mecha_models/hull/null.bbmodel
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"meta":{"format_version":"4.10","model_format":"free","box_uv":false},"name":"null","model_identifier":"","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[],"outliner":[{"name":"root","origin":[0,1,4],"color":0,"uuid":"b9b05ff0-47ee-87bf-8e04-e83d5046d880","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":[{"name":"ordnance1","origin":[0,0,0],"color":0,"uuid":"045a875f-65a0-d37e-651f-ebd1cc54b12b","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":[]}]}],"textures":[]} |
Binary file modified
BIN
+543 KB
(250%)
src/main/resources/assets/armistice/sounds/entity/mecha/cockpit.ogg
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
src/main/resources/data/armistice/armistice/hull/null.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"tier": 1, | ||
"slots": [ | ||
1 | ||
], | ||
"heat": { | ||
"max": 100, | ||
"delay": 20, | ||
"decay": 5 | ||
}, | ||
"id": "armistice:null" | ||
} |