Skip to content

Update Instrument.cs to match API changes in 1.22.0-rc.4 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GeneralMangerTim wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update Instrument.cs to match API changes in 1.22.0-rc.4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2966dcc
Update Instrument.cs to match API changes in 1.22.0-rc.4
GeneralMangerTim Mar 24, 2026
8993ee3
vsinstruments_base.csproj .NET 10 rebuild.
GeneralMangerTim Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/Instrument.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System; // Action<>
using System; // Action<>
using System.Collections.Generic;
using System.Diagnostics; // debug todo remove
using System.IO; // Open files
Expand Down Expand Up @@ -111,7 +111,8 @@ public override void OnHeldInteractStart(ItemSlot slot, EntityAgent byEntity, Bl

if (GetPlayMode(slot) != PlayMode.abc)
{
Vec3d pos = new Vec3d(byEntity.Pos.X, byEntity.Pos.Y, byEntity.Pos.Z);
var epos = byEntity.GetPos();
Vec3d pos = new Vec3d(epos.X, epos.Y, epos.Z);
NoteStart newNote = new NoteStart();
newNote.pitch = currentNote.pitch;
newNote.positon = pos;
Expand Down Expand Up @@ -148,7 +149,8 @@ public override bool OnHeldInteractStep(float secondsUsed, ItemSlot slot, Entity
// Additionally, update the sound packet
if (GetPlayMode(slot) != PlayMode.abc)
{
Vec3d pos = new Vec3d(byEntity.Pos.X, byEntity.Pos.Y, byEntity.Pos.Z);
var epos = byEntity.GetPos();
Vec3d pos = new Vec3d(epos.X, epos.Y, epos.Z);
NoteUpdate newNote = new NoteUpdate();
newNote.pitch = currentNote.pitch;
newNote.positon = pos;
Expand Down Expand Up @@ -228,13 +230,13 @@ private void Update(ItemSlot slot, EntityAgent byEntity)
switch (GetPlayMode(slot))
{
case PlayMode.lockedTone:
AngleToPitchLockedTone(byEntity.Pos.Pitch);
AngleToPitchLockedTone(byEntity.GetPos().Pitch);
break;
case PlayMode.lockedSemiTone:
AngleToPitchLockedSemiTone(byEntity.Pos.Pitch);
AngleToPitchLockedSemiTone(byEntity.GetPos().Pitch);
break;
case PlayMode.fluid:
AngleToPitch(byEntity.Pos.Pitch);
AngleToPitch(byEntity.GetPos().Pitch);
break;
case PlayMode.abc:
// No logic for this mode; all handled by the server.
Expand Down
4 changes: 2 additions & 2 deletions vsinstruments_base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\Mods\mod</OutputPath>
</PropertyGroup>
Expand Down