Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
649bfd7313 | ||
|
0e9ca2f9b1 |
@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="src" path="resources"/>
|
||||
<classpathentry kind="lib" path="D:/Dropbox/Pandacube/Dev/spigot-1.12.jar"/>
|
||||
<classpathentry kind="lib" path="lib"/>
|
||||
<classpathentry kind="lib" path="C:/Users/Marc/.m2/repository/com/destroystokyo/paper/paper/1.16.3-R0.1-SNAPSHOT/paper-1.16.3-R0.1-SNAPSHOT.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-13.0.2"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
15
.settings/org.eclipse.jdt.core.prefs
Normal file
15
.settings/org.eclipse.jdt.core.prefs
Normal file
@ -0,0 +1,15 @@
|
||||
eclipse.preferences.version=1
|
||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
|
||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
|
||||
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
|
||||
org.eclipse.jdt.core.compiler.compliance=11
|
||||
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
|
||||
org.eclipse.jdt.core.compiler.debug.localVariable=generate
|
||||
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
|
||||
org.eclipse.jdt.core.compiler.release=disabled
|
||||
org.eclipse.jdt.core.compiler.source=11
|
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<jardesc>
|
||||
<jar path="DiscoSheep/DiscoSheep-2.0-MC1.12.jar"/>
|
||||
<jar path="DiscoSheep/DiscoSheep.jar"/>
|
||||
<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"/>
|
||||
<selectedProjects/>
|
||||
|
@ -2,6 +2,7 @@ name: DiscoSheep
|
||||
main: me.cwang.discosheep.DiscoSheep
|
||||
authors: [Gibstick, RangerMauve]
|
||||
version: 2.0
|
||||
api-version: 1.16
|
||||
commands:
|
||||
ds:
|
||||
description: "Main DiscoSheep command"
|
||||
|
@ -212,13 +212,13 @@ public class BasicDiscoParty extends AbstractParty {
|
||||
*/
|
||||
@Override
|
||||
protected void playSounds() {
|
||||
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BASS, volumeMultiplier * 0.75f, 1.0f);
|
||||
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_BASS, volumeMultiplier * 0.75f, 1.0f);
|
||||
if (this.state % 2 == 0) {
|
||||
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_SNARE, volumeMultiplier * 0.8f, 1.0f);
|
||||
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_SNARE, volumeMultiplier * 0.8f, 1.0f);
|
||||
}
|
||||
|
||||
if ((this.state + 1) % 8 == 0) {
|
||||
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_HAT, volumeMultiplier * 1.0f, 1.0f);
|
||||
partyLocation.getWorld().playSound(partyLocation, Sound.BLOCK_NOTE_BLOCK_HAT, volumeMultiplier * 1.0f, 1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -41,7 +41,6 @@ public final class DiscoSheep extends JavaPlugin {
|
||||
EntityType.MAGMA_CUBE,
|
||||
EntityType.MUSHROOM_COW,
|
||||
EntityType.OCELOT,
|
||||
EntityType.PIG_ZOMBIE,
|
||||
EntityType.RABBIT,
|
||||
EntityType.SKELETON,
|
||||
EntityType.SLIME,
|
||||
|
@ -50,7 +50,7 @@ public class PartyBuilder {
|
||||
}
|
||||
|
||||
public PartyBuilder period(int period) throws IllegalArgumentException {
|
||||
if (period < 0 || period > AbstractParty.maxPeriod) {
|
||||
if (period <= 0 || period > AbstractParty.maxPeriod) {
|
||||
throw new IllegalArgumentException("invalid period");
|
||||
}
|
||||
this.period = period;
|
||||
|
@ -31,6 +31,6 @@ public class PentatonicParty extends DiscoDecorator {
|
||||
@Override
|
||||
protected void playSounds() {
|
||||
super.playSounds();
|
||||
getLocation().getWorld().playSound(getLocation(), Sound.BLOCK_NOTE_HARP, getVolumeMultiplier() * 1.0f, getPentatonicNote());
|
||||
getLocation().getWorld().playSound(getLocation(), Sound.BLOCK_NOTE_BLOCK_HARP, getVolumeMultiplier() * 1.0f, getPentatonicNote());
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user