Skip to content

Commit f0eca34

Browse files
stan60250stan60250
committed
# Conflicts: # src/main/java/me/crafter/mc/lockettepro/BlockEnvironmentListener.java # src/main/java/me/crafter/mc/lockettepro/BlockPlayerListener.java # src/main/java/me/crafter/mc/lockettepro/Config.java # src/main/java/me/crafter/mc/lockettepro/Dependency.java # src/main/java/me/crafter/mc/lockettepro/LocketteProAPI.java # src/main/resources/config.yml
2 parents 7ff406b + 3746682 commit f0eca34

30 files changed

+4914
-3277
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ local.properties
1313
.classpath
1414
.settings/
1515
.loadpath
16+
.idea/
17+
*.iml
18+
lib/

‎build.gradle‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
apply plugin: 'java'
2+
3+
sourceCompatibility = 1.8
4+
targetCompatibility = 1.8
5+
6+
repositories {
7+
jcenter()
8+
9+
maven {
10+
name 'Spigot'
11+
url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
12+
}
13+
14+
maven {
15+
name 'Sonatype'
16+
url 'https://oss.sonatype.org/content/groups/public'
17+
}
18+
19+
maven {
20+
name 'sk89q'
21+
url 'http://maven.sk89q.com/artifactory/repo/'
22+
}
23+
24+
maven {
25+
name 'vault-repo'
26+
url 'http://nexus.hc.to/content/repositories/pub_releases'
27+
}
28+
29+
maven {
30+
name 'dmulloy2'
31+
url 'http://repo.dmulloy2.net/content/groups/public/'
32+
}
33+
}
34+
35+
dependencies {
36+
compile 'org.bukkit:bukkit:1.13-pre7-R0.1-SNAPSHOT'
37+
compile ('net.milkbowl.vault:VaultAPI:1.6') {
38+
transitive = false
39+
}
40+
compile ('com.sk89q:worldguard:6.1') {
41+
transitive = false
42+
}
43+
compile ('com.comphenix.protocol:ProtocolLib-API:4.4.0-SNAPSHOT') {
44+
//transitive = false
45+
}
46+
compile files('lib/Residence4.7.8.2.jar')
47+
compile files('lib/askyblock.jar')
48+
compile files('lib/PlotSquared.jar')
49+
compile files('lib/SimpleClans.jar')
50+
compile files('lib/Factions.jar')
51+
compile files('lib/MassiveCore.jar')
52+
compile files('lib/Towny.jar')
53+
compile files('lib/GriefPrevention.jar')
54+
}
55+
compileJava {
56+
options.compilerArgs += ["-Xlint:deprecation"]
57+
}

‎config.yml‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎src/me/crafter/mc/lockettepro/BlockDebugListener.java‎ renamed to ‎src/main/java/me/crafter/mc/lockettepro/BlockDebugListener.java‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
1-
package me.crafter.mc.lockettepro;
1+
package me.crafter.mc.lockettepro;
2+
3+
import org.bukkit.ChatColor;
4+
import org.bukkit.Material;
5+
import org.bukkit.block.Block;
6+
import org.bukkit.block.Sign;
7+
import org.bukkit.entity.Player;
8+
import org.bukkit.event.EventHandler;
9+
import org.bukkit.event.EventPriority;
10+
import org.bukkit.event.Listener;
11+
import org.bukkit.event.block.Action;
12+
import org.bukkit.event.player.PlayerInteractEvent;
13+
14+
public class BlockDebugListener implements Listener {
15+
16+
@SuppressWarnings("deprecation")
17+
@EventHandler(priority = EventPriority.MONITOR)
18+
public void onDebugClick(PlayerInteractEvent event){
19+
Player p = event.getPlayer();
20+
if (p.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK){
21+
event.setCancelled(true);
22+
Block b = event.getClickedBlock();
23+
p.sendMessage(ChatColor.GREEN + "===========================");
24+
p.sendMessage("isLockable: " + formatBoolean(LocketteProAPI.isLockable(b)));
25+
p.sendMessage("isLocked: " + formatBoolean(LocketteProAPI.isLocked(b)));
26+
p.sendMessage(" - isOwner/User: " + formatBoolean(LocketteProAPI.isOwner(b, p)) + ChatColor.RESET + "/" + formatBoolean(LocketteProAPI.isUser(b, p)));
27+
p.sendMessage("isLockedSingle: " + formatBoolean(LocketteProAPI.isLockedSingleBlock(b, null)));
28+
p.sendMessage(" - isOwner/UserSingle: " + formatBoolean(LocketteProAPI.isOwnerSingleBlock(b, null, p)) + ChatColor.RESET + "/" + formatBoolean(LocketteProAPI.isUserSingleBlock(b, null, p)));
29+
p.sendMessage("isLockedUpDownLockedDoor: " + formatBoolean(LocketteProAPI.isUpDownLockedDoor(b)));
30+
p.sendMessage(" - isOwner/UserSingle: " + formatBoolean(LocketteProAPI.isOwnerUpDownLockedDoor(b, p)) + ChatColor.RESET + "/" + formatBoolean(LocketteProAPI.isOwnerUpDownLockedDoor(b, p)));
31+
if (LocketteProAPI.isLockSign(b)){
32+
p.sendMessage("isSignExpired: " + formatBoolean(LocketteProAPI.isSignExpired(b)));
33+
p.sendMessage(" - created: " + Utils.getCreatedFromLine(((Sign)b.getState()).getLine(0)));
34+
p.sendMessage(" - now : " + (int)(System.currentTimeMillis()/1000));
35+
}
36+
37+
p.sendMessage("Block: " + b.getType().toString() + " " + b.getData());
38+
39+
if (b.getType() == Material.WALL_SIGN){
40+
for (String line : ((Sign)b.getState()).getLines()){
41+
p.sendMessage(ChatColor.GREEN + line);
42+
}
43+
}
44+
p.sendMessage(p.getUniqueId().toString());
45+
}
46+
}
47+
48+
public String formatBoolean(boolean tf){
49+
if (tf){
50+
return ChatColor.GREEN + "true";
51+
} else {
52+
return ChatColor.RED + "false";
53+
}
54+
}
55+
56+
}
57+
258

3-
import org.bukkit.ChatColor;
4-
import org.bukkit.Material;
5-
import org.bukkit.block.Block;
6-
import org.bukkit.block.Sign;
7-
import org.bukkit.entity.Player;
8-
import org.bukkit.event.EventHandler;
9-
import org.bukkit.event.EventPriority;
10-
import org.bukkit.event.Listener;
11-
import org.bukkit.event.block.Action;
12-
import org.bukkit.event.player.PlayerInteractEvent;
13-
14-
public class BlockDebugListener implements Listener {
15-
16-
@SuppressWarnings("deprecation")
17-
@EventHandler(priority = EventPriority.MONITOR)
18-
public void onDebugClick(PlayerInteractEvent event){
19-
Player p = event.getPlayer();
20-
if (p.isSneaking() && event.getAction() == Action.LEFT_CLICK_BLOCK){
21-
event.setCancelled(true);
22-
Block b = event.getClickedBlock();
23-
p.sendMessage(ChatColor.GREEN + "===========================");
24-
p.sendMessage("isLockable: " + formatBoolean(LocketteProAPI.isLockable(b)));
25-
p.sendMessage("isLocked: " + formatBoolean(LocketteProAPI.isLocked(b)));
26-
p.sendMessage(" - isOwner/User: " + formatBoolean(LocketteProAPI.isOwner(b, p)) + ChatColor.RESET + "/" + formatBoolean(LocketteProAPI.isUser(b, p)));
27-
p.sendMessage("isLockedSingle: " + formatBoolean(LocketteProAPI.isLockedSingleBlock(b, null)));
28-
p.sendMessage(" - isOwner/UserSingle: " + formatBoolean(LocketteProAPI.isOwnerSingleBlock(b, null, p)) + ChatColor.RESET + "/" + formatBoolean(LocketteProAPI.isUserSingleBlock(b, null, p)));
29-
p.sendMessage("isLockedUpDownLockedDoor: " + formatBoolean(LocketteProAPI.isUpDownLockedDoor(b)));
30-
p.sendMessage(" - isOwner/UserSingle: " + formatBoolean(LocketteProAPI.isOwnerUpDownLockedDoor(b, p)) + ChatColor.RESET + "/" + formatBoolean(LocketteProAPI.isOwnerUpDownLockedDoor(b, p)));
31-
if (LocketteProAPI.isLockSign(b)){
32-
p.sendMessage("isSignExpired: " + formatBoolean(LocketteProAPI.isSignExpired(b)));
33-
p.sendMessage(" - created: " + Utils.getCreatedFromLine(((Sign)b.getState()).getLine(0)));
34-
p.sendMessage(" - now : " + (int)(System.currentTimeMillis()/1000));
35-
}
36-
37-
p.sendMessage("Block: " + b.getType().toString() + " " + b.getTypeId() + ":" + b.getData());
38-
39-
if (b.getType() == Material.WALL_SIGN){
40-
for (String line : ((Sign)b.getState()).getLines()){
41-
p.sendMessage(ChatColor.GREEN + line);
42-
}
43-
}
44-
p.sendMessage(p.getUniqueId().toString());
45-
}
46-
}
47-
48-
public String formatBoolean(boolean tf){
49-
if (tf){
50-
return ChatColor.GREEN + "true";
51-
} else {
52-
return ChatColor.RED + "false";
53-
}
54-
}
55-
56-
}
57-
58-

0 commit comments

Comments
 (0)