sigonasr2/SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into devAnvil

Browse Source 
Conflicts:
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class
	BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class
This commit is contained in:
sigonasr2 2013-11-19 02:26:12 -07:00
commit 7abdc22d0a
11 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
BankEconomyMod/.classpath Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/Users/Joshua Sigona/Dropbox/Projects/External Plugins/bukkit-1.6.4-R2.1-20131031.000035-1.jar"/>
<classpathentry kind="lib" path="C:/Users/Joshua Sigona/Dropbox/Projects/External Plugins/Vault.jar"/>
<classpathentry kind="lib" path="C:/Users/Joshua Sigona/Dropbox/Projects/External Plugins/WorldEdit.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$10.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$11.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$12.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$13.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$14.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$15.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$16.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$17.class
View File

Binary file not shown.

BIN
BankEconomyMod/bin/me/kaZep/Base/PlayerListener$9.class
View File

Binary file not shown.

15
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
View File

@ -18,6 +18,8 @@ import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse;
//import net.minecraft.server.v1_4_R1.EntityWolf;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
@ -9752,7 +9754,10 @@ implements Listener
Bukkit.getLogger().info("Anvil interface CLICK at slot #" + event.getRawSlot());
if (event.getRawSlot() < 27) {
if (event.getRawSlot() == -999) {
anvilClicked = false;
Bukkit.getLogger().info("Window exterior clicked.");
} else if (event.getRawSlot() < 27) {
anvilClicked = true;
Bukkit.getLogger().info("Anvil clicked.");
} else {
@ -9944,6 +9949,7 @@ implements Listener
Bukkit.getLogger().info("Anvil INPUT click with this item on mouse: " + event.getCursor().getType().toString());
/*
if (event.getCursor().getType().toString().toUpperCase().contains("HELMET") || event.getCursor().getType().toString().toUpperCase().contains("CHESTPLATE") ||
event.getCursor().getType().toString().toUpperCase().contains("LEGGINGS") || event.getCursor().getType().toString().toUpperCase().contains("BOOTS") ||
event.getCursor().getType().toString().toUpperCase().contains("PICKAXE") || event.getCursor().getType().toString().toUpperCase().contains("SPADE") ||
@ -9958,6 +9964,7 @@ implements Listener
// Can't put fully repaired item into input slot.
valid = false;
}
*/
} else if (event.getSlotType() == SlotType.CONTAINER && event.getSlot() == MATERIALS) {
/*
@ -9967,13 +9974,16 @@ implements Listener
Bukkit.getLogger().info("Anvil MATERIALS click with this item on mouse: " + event.getCursor().getType().toString());
/*
if (event.getCursor().getType() == Material.LEATHER || event.getCursor().getType() == Material.IRON_INGOT ||
event.getCursor().getType() == Material.GOLD_INGOT || event.getCursor().getType() == Material.IRON_BLOCK ||
event.getCursor().getType() == Material.DIAMOND_BLOCK || event.getCursor().getType() == Material.DIAMOND ||
event.getCursor().getType() == Material.WOOD || event.getCursor().getType() == Material.COBBLESTONE ||
event.getCursor().getType() == Material.LOG || event.getCursor().getType() == Material.STONE ||
event.getCursor().getType() == Material.STRING) {
valid = true;
}
*/
} else if (event.getSlotType() == SlotType.CONTAINER && event.getSlot() == MAGIC) {
/*
@ -9992,6 +10002,7 @@ implements Listener
*/
}
/*
if (!valid) {
event.setCancelled(true);
} else {
@ -9999,6 +10010,8 @@ implements Listener
// Set up anvil inventory update scheduler
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
}
*/
Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName()));
} else {
event.setCancelled(true);
}