ChomeNS/SongPlayer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attempt at fixing issue with random noteblock instrument changes

Browse source
This commit is contained in:
Harry Zhou 2022-07-01 20:35:55 -05:00
parent 710130bbac
commit ef1c5715b2
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/github/hhhzzzsss/songplayer/playing/SongHandler.java
View file

@ -199,7 +199,9 @@ public class SongHandler {
} }
if (tick) { if (tick) {
stage.checkBuildStatus(currentSong); if (stage.hasBreakingModification()) {
stage.checkBuildStatus(currentSong);
}
if (!stage.missingNotes.isEmpty()) { if (!stage.missingNotes.isEmpty()) {
building = true; building = true;
setCreativeIfNeeded(); setCreativeIfNeeded();

27
src/main/java/com/github/hhhzzzsss/songplayer/playing/Stage.java
View file

@ -199,4 +199,31 @@ public class Stage {
public boolean nothingToBuild() { public boolean nothingToBuild() {
return requiredBreaks.isEmpty() && missingNotes.isEmpty(); return requiredBreaks.isEmpty() && missingNotes.isEmpty();
} }
private static final int WRONG_INSTRUMENT_TOLERANCE = 3;
public boolean hasBreakingModification() {
int wrongInstruments = 0;
for (Map.Entry<Integer, BlockPos> entry : noteblockPositions.entrySet()) {
BlockState bs = SongPlayer.MC.world.getBlockState(entry.getValue());
int blockId = Block.getRawIdFromState(bs);
int actualNoteId = (blockId-SongPlayer.NOTEBLOCK_BASE_ID)/2;
if (actualNoteId < 0 || actualNoteId >= 400) {
return true;
}
int actualInstrument = actualNoteId / 25;
int actualPtich = actualNoteId % 25;
int targetInstrument = entry.getKey() / 25;
int targetPitch = entry.getKey() % 25;
if (targetPitch != actualPtich) {
return true;
}
if (targetInstrument != actualInstrument) {
wrongInstruments++;
if (wrongInstruments > WRONG_INSTRUMENT_TOLERANCE) {
return true;
}
}
}
return false;
}
} }