PandacubeFr/DiscoSheep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: PandacubeFr:master
Branches Tags
PandacubeFr:master
PandacubeFr:1.12
...
pull from: PandacubeFr:1.12
Branches Tags
PandacubeFr:master
PandacubeFr:1.12

1 Commits
master ... 1.12

Author SHA1 Message Date
Marc Baloup
6e96bfece7 1.12 support also 2019-07-10 17:49:35 +02:00
4 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
.classpath
View File

@ -3,7 +3,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/> <classpathentry kind="src" path="resources"/>
<classpathentry kind="lib" path="D:/Dropbox/Pandacube/Dev/spigot-1.14.3.jar"/> <classpathentry kind="lib" path="D:/Dropbox/Pandacube/Dev/spigot-1.12.jar"/>
<classpathentry kind="lib" path="lib"/> <classpathentry kind="lib" path="lib"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
export.jardesc
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<jardesc> <jardesc>
<jar path="DiscoSheep/DiscoSheep.jar"/> <jar path="DiscoSheep/DiscoSheep-2.0-MC1.12.jar"/>
<options buildIfNeeded="true" compress="true" descriptionLocation="/DiscoSheep/export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/> <options buildIfNeeded="true" compress="true" descriptionLocation="/DiscoSheep/export.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
<storedRefactorings deprecationInfo="true" structuralOnly="false"/> <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
<selectedProjects/> <selectedProjects/>

6
src/me/cwang/discosheep/BasicDiscoParty.java
View File

@ -212,13 +212,13 @@ public class BasicDiscoParty extends AbstractParty {
*/ */
@Override @Override
protected void playSounds() { protected void playSounds() {
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_BASS, volumeMultiplier * 0.75f, 1.0f); partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BASS, volumeMultiplier * 0.75f, 1.0f);
if (this.state % 2 == 0) { if (this.state % 2 == 0) {
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_SNARE, volumeMultiplier * 0.8f, 1.0f); partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_SNARE, volumeMultiplier * 0.8f, 1.0f);
} }
if ((this.state + 1) % 8 == 0) { if ((this.state + 1) % 8 == 0) {
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_HAT, volumeMultiplier * 1.0f, 1.0f); partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_HAT, volumeMultiplier * 1.0f, 1.0f);
} }
} }

2
src/me/cwang/discosheep/PentatonicParty.java
View File

@ -31,6 +31,6 @@ public class PentatonicParty extends DiscoDecorator {
@Override @Override
protected void playSounds() { protected void playSounds() {
super.playSounds(); super.playSounds();
getLocation().getWorld().playSound(getLocation(), Sound.BLOCK_NOTE_BLOCK_HARP, getVolumeMultiplier() * 1.0f, getPentatonicNote()); getLocation().getWorld().playSound(getLocation(), Sound.BLOCK_NOTE_HARP, getVolumeMultiplier() * 1.0f, getPentatonicNote());
} }
} }