mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

More merge conflicts please

Browse Source
This commit is contained in:
CocoTheOwner 2021-08-17 18:07:38 +02:00
parent 198820d95d
commit 01479a82de
10 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java
View File

@ -74,7 +74,7 @@ public class CommandIrisObjectContract extends MortarCommand {
b[1] = cursor.getUpperSW(); b[1] = cursor.getUpperSW();
p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1])); p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
p.updateInventory(); p.updateInventory();
p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f); sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
return true; return true;
} }

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java
View File

@ -74,7 +74,7 @@ public class CommandIrisObjectExpand extends MortarCommand {
b[1] = cursor.getUpperSW(); b[1] = cursor.getUpperSW();
p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1])); p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
p.updateInventory(); p.updateInventory();
p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f); sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
return true; return true;
} }

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java
View File

@ -174,7 +174,7 @@ public class CommandIrisObjectPaste extends MortarCommand {
Iris.debug("Loaded object for placement: " + "objects/" + args[0] + ".iob"); Iris.debug("Loaded object for placement: " + "objects/" + args[0] + ".iob");
sender.player().getWorld().playSound(sender.player().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f); sender.playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
Set<Material> skipBlocks = Set.of(Material.GRASS, Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH, Set<Material> skipBlocks = Set.of(Material.GRASS, Material.SNOW, Material.VINE, Material.TORCH, Material.DEAD_BUSH,
Material.POPPY, Material.DANDELION); Material.POPPY, Material.DANDELION);

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java
View File

@ -88,7 +88,7 @@ public class CommandIrisObjectSave extends MortarCommand {
o.write(file); o.write(file);
sender.sendMessage("Saved " + args[1]); sender.sendMessage("Saved " + args[1]);
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f); sender.playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
} catch (Throwable e) { } catch (Throwable e) {
Iris.reportError(e); Iris.reportError(e);
sender.sendMessage("Failed to save " + args[1] + ". Are you holding your wand?"); sender.sendMessage("Failed to save " + args[1] + ". Are you holding your wand?");

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSaveMatter.java
View File

@ -88,7 +88,7 @@ public class CommandIrisObjectSaveMatter extends MortarCommand {
o.write(file); o.write(file);
sender.sendMessage("Saved " + args[1]); sender.sendMessage("Saved " + args[1]);
p.getWorld().playSound(p.getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f); sender.playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
} catch (Throwable e) { } catch (Throwable e) {
Iris.reportError(e); Iris.reportError(e);
sender.sendMessage("Failed to save " + args[1] + ". Are you holding your wand?"); sender.sendMessage("Failed to save " + args[1] + ". Are you holding your wand?");

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java
View File

@ -75,7 +75,7 @@ public class CommandIrisObjectShift extends MortarCommand {
b[1] = cursor.getUpperSW(); b[1] = cursor.getUpperSW();
p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1])); p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
p.updateInventory(); p.updateInventory();
p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f); sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
return true; return true;
} }

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java
View File

@ -101,7 +101,7 @@ public class CommandIrisObjectXAY extends MortarCommand {
b[1] = cursor.getUpperSW(); b[1] = cursor.getUpperSW();
p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1])); p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
p.updateInventory(); p.updateInventory();
p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f); sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
return true; return true;
} }

2
src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java
View File

@ -89,7 +89,7 @@ public class CommandIrisObjectXPY extends MortarCommand {
b[1] = cursor.getUpperSW(); b[1] = cursor.getUpperSW();
p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1])); p.getInventory().setItemInMainHand(WandSVC.createWand(b[0], b[1]));
p.updateInventory(); p.updateInventory();
p.playSound(p.getLocation(), Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f); sender.playSound(Sound.ENTITY_ITEM_FRAME_ROTATE_ITEM, 1f, 0.55f);
return true; return true;
} }

2
src/main/java/com/volmit/iris/core/decrees/DecObject.java
View File

@ -196,7 +196,7 @@ public class DecObject implements DecreeExecutor {
IrisObjectPlacement placement = new IrisObjectPlacement(); IrisObjectPlacement placement = new IrisObjectPlacement();
placement.setRotation(IrisObjectRotation.of(0, rotate, 0)); placement.setRotation(IrisObjectRotation.of(0, rotate, 0));
sender().player().getWorld().playSound(sender().player().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f); sender().playSound(Sound.BLOCK_ENCHANTMENT_TABLE_USE, 1f, 1.5f);
} }

4
src/main/java/com/volmit/iris/util/plugin/MortarCommand.java
View File

@ -100,8 +100,8 @@ public abstract class MortarCommand implements ICommand {
} }
if (sender.isPlayer() && IrisSettings.get().getGeneral().isCommandSounds()) { if (sender.isPlayer() && IrisSettings.get().getGeneral().isCommandSounds()) {
sender.player().getWorld().playSound(sender.player().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.28f, 1.4f); sender.playSound(Sound.ITEM_BOOK_PAGE_TURN, 0.28f, 1.4f);
sender.player().getWorld().playSound(sender.player().getLocation(), Sound.ITEM_AXE_STRIP, 0.35f, 1.7f); sender.playSound(Sound.ITEM_AXE_STRIP, 0.35f, 1.7f);
} }
} }