Skip to content

Commit

Permalink
Updated sound enumerations for MC 1.9.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Battelman2
Battelman2 committed Mar 31, 2016
1 parent bc2f333 commit 5e3a5cf
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 75 deletions.
1 change: 0 additions & 1 deletion src/com/jcdesimp/landlord/LandlordCommandExecutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class LandlordCommandExecutor implements CommandExecutor {

private HashMap<String, LandlordCommand> registeredCommands;

//private Base baseCommand;
private Help helpCommand;

public LandlordCommandExecutor(Landlord plugin) {
Expand Down
7 changes: 2 additions & 5 deletions src/com/jcdesimp/landlord/commands/AddFriend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import com.jcdesimp.landlord.Landlord;
import com.jcdesimp.landlord.persistantData.Friend;
import com.jcdesimp.landlord.persistantData.OwnedLand;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.Effect;
import org.bukkit.OfflinePlayer;
import org.bukkit.*;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -96,7 +93,7 @@ public boolean execute(CommandSender sender, String[] args, String label) {

plugin.getDatabase().save(land);
if (plugin.getConfig().getBoolean("options.soundEffects", true)) { //conf
//TODO player.playSound(player.getLocation(), Sound.ORB_PICKUP,10,.2f);
player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 10, .2f);
}
sender.sendMessage(ChatColor.GREEN + nowFriend.replace("#{player}", args[1]));
plugin.getMapManager().updateAll();
Expand Down
56 changes: 0 additions & 56 deletions src/com/jcdesimp/landlord/commands/Base.java
View file

This file was deleted.

3 changes: 2 additions & 1 deletion src/com/jcdesimp/landlord/commands/Claim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.Effect;
import org.bukkit.Sound;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -149,7 +150,7 @@ public boolean execute(CommandSender sender, String[] args, String label) {
.replace("#{worldName}", currChunk.getWorld().getName()));

if (plugin.getConfig().getBoolean("options.soundEffects", true)) {
//TODO player.playSound(player.getLocation(), Sound.FIREWORK_TWINKLE2,10,10);
player.playSound(player.getLocation(), Sound.ENTITY_FIREWORK_TWINKLE, 10, 10);
}


Expand Down
3 changes: 2 additions & 1 deletion src/com/jcdesimp/landlord/commands/Unclaim.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.Effect;
import org.bukkit.Sound;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -151,7 +152,7 @@ public boolean execute(CommandSender sender, String[] args, String label) {
}

if (plugin.getConfig().getBoolean("options.soundEffects", true)) {
//TODO player.playSound(player.getLocation(), Sound.ENDERMAN_HIT, 10, .5f);
player.playSound(player.getLocation(), Sound.ENTITY_ENDERMEN_HURT, 10, .5f);
}
plugin.getMapManager().updateAll();

Expand Down
3 changes: 2 additions & 1 deletion src/com/jcdesimp/landlord/commands/Unfriend.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.Effect;
import org.bukkit.Sound;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -81,7 +82,7 @@ public boolean execute(CommandSender sender, String[] args, String label) {
}
plugin.getDatabase().save(land);
if (plugin.getConfig().getBoolean("options.soundEffects", true)) { //conf
//TODO player.playSound(player.getLocation(), Sound.ZOMBIE_INFECT,10,.5f);
player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_INFECT, 10, .5f);
}
player.sendMessage(ChatColor.GREEN + unfriended.replace("#{playerName}", args[1]));

Expand Down
15 changes: 6 additions & 9 deletions src/com/jcdesimp/landlord/landManagement/LandManagerView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import com.jcdesimp.landlord.Landlord;
import com.jcdesimp.landlord.persistantData.OwnedLand;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
import org.bukkit.Material;
import org.bukkit.*;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.HumanEntity;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -210,7 +207,7 @@ public void onInventoryClose(InventoryCloseEvent event) {
Landlord.getInstance().getDatabase().save(mLand);
player.sendMessage(ChatColor.GREEN + messages.getString("manager.saved"));
if (Landlord.getInstance().getConfig().getBoolean("options.soundEffects", true)) {
//todo player.playSound(player.getLocation(),Sound.FIZZ,10,10);
player.playSound(player.getLocation(), Sound.BLOCK_LAVA_EXTINGUISH, 10, 10);
}
mLand.highlightLand(player, Effect.LAVADRIP);
//InventoryCloseEvent.getHandlerList().unregister(this);
Expand Down Expand Up @@ -254,10 +251,10 @@ public void clickButton(InventoryClickEvent event) {
if ((col <= (endIndex - startIndex) && col > 0)) {

if (row == 1) {
//todo player.playSound(player.getLocation(), Sound.CLICK, 1L, 1L);
player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 1L, 1L);
perms[0][permSlots.get((col - 1) + ((pageNum) * 8))] = bSwap(perms[0][permSlots.get((col - 1) + ((pageNum) * 8))]);
} else if (row == 2) {
//todo player.playSound(player.getLocation(), Sound.CLICK, 1L, 1L);
player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 1L, 1L);
//System.out.println((col-1)+((pageNum)*8));
perms[1][permSlots.get((col - 1) + ((pageNum) * 8))] = bSwap(perms[1][permSlots.get((col - 1) + ((pageNum) * 8))]);
//System.out.println(perms[1][permSlots.get((col-1)+((pageNum)*8))]);
Expand All @@ -269,15 +266,15 @@ public void clickButton(InventoryClickEvent event) {

if (pageNum < numPages - 1 && event.getRawSlot() == 35) {
//35
//todo player.playSound(player.getLocation(), Sound.CLICK, 1L, 1L);
player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 1L, 1L);
pageNum++;
updateUIData();
setToggles();
buildUI();
}
if (pageNum > 0 && event.getRawSlot() == 27) {
//27
//todo player.playSound(player.getLocation(), Sound.CLICK, 1L, 1L);
player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 1L, 1L);
pageNum--;
updateUIData();
setToggles();
Expand Down
2 changes: 1 addition & 1 deletion src/plugin.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Landlord
main: com.jcdesimp.landlord.Landlord
version: 1.3.1
version: 1.4.0
author: Jcdesimp
authors: []
website: http://dev.bukkit.org/bukkit-plugins/landlord/
Expand Down

3 comments on commit 5e3a5cf

@TheFluffyWalrus
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did I miss something here on this... the code that I pulled looked like it had already been done or is that im just not used to GitHub yet

@TheFluffyWalrus
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what happened.... I forked the wrong branch.... like a retard

@Battelman2
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All good mate. We're almost ready to ship this version. We're just performing some more extensive testing and then we'll send out our official release. Afterwards, we'll start improving it- but getting a working 1.9 version is our priority.

Please sign in to comment.