Skip to content

Commit 442dace

Browse files
MrButtersDEVMrButtersDEV
committed
2 parents 03a4d6a + 27a90c0 commit 442dace

File tree

2 files changed

+146
-37
lines changed

2 files changed

+146
-37
lines changed

‎src/main/java/us/thezircon/play/autopickup/listeners/BlockBreakEventListener.java‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,126 @@ public void run() {
337337
addLocation(lnew, e.getPlayer());
338338
}
339339

340+
if (
341+
Bukkit.getVersion().contains("1.16") ||
342+
Bukkit.getVersion().contains("1.17") ||
343+
Bukkit.getVersion().contains("1.18") ||
344+
Bukkit.getVersion().contains("1.19") ||
345+
Bukkit.getVersion().contains("1.20") ||
346+
Bukkit.getVersion().contains("1.21")
347+
) {
348+
//deal with weeping vines
349+
if (e.getBlock().getType() == Material.WEEPING_VINES_PLANT || e.getBlock().getRelative(BlockFace.DOWN).getType() == Material.WEEPING_VINES_PLANT) {
350+
Location lnew = l.clone();
351+
do {
352+
lnew.setY(lnew.getY() - 1);
353+
if (lnew.getBlock().getType() == Material.WEEPING_VINES_PLANT) {
354+
addLocation(lnew, e.getPlayer());
355+
} else {
356+
break;
357+
}
358+
} while (true);
359+
addLocation(lnew, e.getPlayer());
360+
} else if (e.getBlock().getType() == Material.WEEPING_VINES || e.getBlock().getRelative(BlockFace.DOWN).getType() == Material.WEEPING_VINES) {
361+
Location lnew = l.clone();
362+
do {
363+
lnew.setY(lnew.getY() - 1);
364+
if (lnew.getBlock().getType() == Material.WEEPING_VINES) {
365+
addLocation(lnew, e.getPlayer());
366+
} else {
367+
break;
368+
}
369+
} while (true);
370+
addLocation(lnew, e.getPlayer());
371+
}
372+
373+
//deal with twisting vines
374+
if (e.getBlock().getType() == Material.TWISTING_VINES_PLANT || e.getBlock().getRelative(BlockFace.UP).getType() == Material.TWISTING_VINES_PLANT) {
375+
Location lnew = l.clone();
376+
do {
377+
lnew.setY(lnew.getY() + 1);
378+
if (lnew.getBlock().getType() == Material.TWISTING_VINES_PLANT) {
379+
addLocation(lnew, e.getPlayer());
380+
} else {
381+
break;
382+
}
383+
} while (true);
384+
addLocation(lnew, e.getPlayer());
385+
} else if (e.getBlock().getType() == Material.TWISTING_VINES || e.getBlock().getRelative(BlockFace.UP).getType() == Material.TWISTING_VINES) {
386+
Location lnew = l.clone();
387+
do {
388+
lnew.setY(lnew.getY() + 1);
389+
if (lnew.getBlock().getType() == Material.TWISTING_VINES) {
390+
addLocation(lnew, e.getPlayer());
391+
} else {
392+
break;
393+
}
394+
} while (true);
395+
addLocation(lnew, e.getPlayer());
396+
}
397+
398+
if(!Bukkit.getVersion().contains("1.16")) {
399+
//deal with glow berries
400+
if (e.getBlock().getType() == Material.CAVE_VINES_PLANT || e.getBlock().getRelative(BlockFace.DOWN).getType() == Material.CAVE_VINES_PLANT) {
401+
Location lnew = l.clone();
402+
do {
403+
lnew.setY(lnew.getY() - 1);
404+
if (lnew.getBlock().getType() == Material.CAVE_VINES_PLANT) {
405+
addLocation(lnew, e.getPlayer());
406+
} else {
407+
break;
408+
}
409+
} while (true);
410+
addLocation(lnew, e.getPlayer());
411+
} else if (e.getBlock().getType() == Material.CAVE_VINES || e.getBlock().getRelative(BlockFace.DOWN).getType() == Material.CAVE_VINES) {
412+
Location lnew = l.clone();
413+
do {
414+
lnew.setY(lnew.getY() - 1);
415+
if (lnew.getBlock().getType() == Material.CAVE_VINES) {
416+
addLocation(lnew, e.getPlayer());
417+
} else {
418+
break;
419+
}
420+
} while (true);
421+
addLocation(lnew, e.getPlayer());
422+
}
423+
424+
//deal with dripleafs
425+
if (e.getBlock().getType() == Material.BIG_DRIPLEAF_STEM || e.getBlock().getRelative(BlockFace.UP).getType() == Material.BIG_DRIPLEAF_STEM) {
426+
Location lnew = l.clone();
427+
double y = lnew.getY();
428+
do {
429+
lnew.setY(lnew.getY() + 1);
430+
if (lnew.getBlock().getType() == Material.BIG_DRIPLEAF_STEM) {
431+
addLocation(lnew, e.getPlayer());
432+
} else if (lnew.getBlock().getType() == Material.BIG_DRIPLEAF) {
433+
addLocation(lnew, e.getPlayer());
434+
} else {
435+
y--;
436+
lnew.setY(y);
437+
if (lnew.getBlock().getType() == Material.BIG_DRIPLEAF_STEM) {
438+
addLocation(lnew, e.getPlayer());
439+
} else {
440+
break;
441+
}
442+
}
443+
} while (true);
444+
addLocation(lnew, e.getPlayer());
445+
} else if (e.getBlock().getType() == Material.BIG_DRIPLEAF || e.getBlock().getRelative(BlockFace.UP).getType() == Material.BIG_DRIPLEAF) {
446+
Location lnew = l.clone();
447+
do {
448+
lnew.setY(lnew.getY() - 1);
449+
if (lnew.getBlock().getType() == Material.BIG_DRIPLEAF) {
450+
addLocation(lnew, e.getPlayer());
451+
} else {
452+
break;
453+
}
454+
} while (true);
455+
addLocation(lnew, e.getPlayer());
456+
}
457+
}
458+
}
459+
340460
// TEST END
341461

342462
if (verticalReq.contains(e.getBlock().getType()) || verticalReqDown.contains(e.getBlock().getType())) {

‎src/main/java/us/thezircon/play/autopickup/utils/TallCrops.java‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,31 @@
44
import org.bukkit.Material;
55

66
import java.util.ArrayList;
7+
import java.util.Objects;
78

89
public class TallCrops {
910

1011
public ArrayList<Material> verticalReq = new ArrayList<>();
1112
public ArrayList<Material> verticalReqDown = new ArrayList<>();
1213

1314
public TallCrops () {
14-
//verticalReq.add(Material.SUGAR_CANE);
15-
//verticalReq.add(Material.CACTUS);
16-
//verticalReq.add(Material.KELP);
17-
//verticalReq.add(Material.KELP_PLANT);
18-
19-
if (Bukkit.getVersion().contains("1.18") || Bukkit.getVersion().contains("1.19")) {
20-
verticalReqDown.add(Material.WEEPING_VINES);
21-
verticalReqDown.add(Material.WEEPING_VINES_PLANT);
22-
verticalReq.add(Material.TWISTING_VINES_PLANT);
23-
verticalReq.add(Material.TWISTING_VINES);
24-
verticalReq.add(Material.BAMBOO);
25-
verticalReq.add(Material.BAMBOO_SAPLING);
26-
verticalReq.add(Material.BIG_DRIPLEAF_STEM);
27-
verticalReq.add(Material.BIG_DRIPLEAF);
28-
} else if (Bukkit.getVersion().contains("1.17")) {
29-
verticalReqDown.add(Material.WEEPING_VINES);
30-
verticalReqDown.add(Material.WEEPING_VINES_PLANT);
31-
verticalReq.add(Material.TWISTING_VINES_PLANT);
32-
verticalReq.add(Material.TWISTING_VINES);
33-
verticalReq.add(Material.BAMBOO);
34-
verticalReq.add(Material.BAMBOO_SAPLING);
35-
verticalReq.add(Material.BIG_DRIPLEAF_STEM);
36-
verticalReq.add(Material.BIG_DRIPLEAF);
37-
} else if (Bukkit.getVersion().contains("1.16")) {
38-
verticalReqDown.add(Material.WEEPING_VINES);
39-
verticalReqDown.add(Material.WEEPING_VINES_PLANT);
40-
verticalReq.add(Material.TWISTING_VINES_PLANT);
41-
verticalReq.add(Material.TWISTING_VINES);
42-
verticalReq.add(Material.BAMBOO);
43-
verticalReq.add(Material.BAMBOO_SAPLING);
44-
} else if (Bukkit.getVersion().contains("1.15")) {
45-
verticalReq.add(Material.BAMBOO);
46-
verticalReq.add(Material.BAMBOO_SAPLING);
47-
} else if (Bukkit.getVersion().contains("1.14")) {
15+
if (
16+
Bukkit.getVersion().contains("1.14") ||
17+
Bukkit.getVersion().contains("1.15") ||
18+
Bukkit.getVersion().contains("1.16") ||
19+
Bukkit.getVersion().contains("1.17") ||
20+
Bukkit.getVersion().contains("1.18") ||
21+
Bukkit.getVersion().contains("1.19") ||
22+
Bukkit.getVersion().contains("1.20") ||
23+
Bukkit.getVersion().contains("1.21")
24+
) {
25+
verticalReq.add(Material.KELP);
26+
verticalReq.add(Material.KELP_PLANT);
4827
verticalReq.add(Material.BAMBOO);
4928
verticalReq.add(Material.BAMBOO_SAPLING);
29+
}else if(Bukkit.getVersion().contains("1.13")) {
30+
verticalReq.add(Material.KELP);
31+
verticalReq.add(Material.KELP_PLANT);
5032
}
5133
}
5234

@@ -59,9 +41,16 @@ public ArrayList<Material> getVerticalReqDown() {
5941
}
6042

6143
public static Material checkAltType(Material material) {
62-
if (Bukkit.getVersion().contains("1.17")) {
63-
if (material.equals(Material.BIG_DRIPLEAF_STEM)) {
64-
return Material.BIG_DRIPLEAF;
44+
if (
45+
Bukkit.getVersion().contains("1.16") ||
46+
Bukkit.getVersion().contains("1.17") ||
47+
Bukkit.getVersion().contains("1.18") ||
48+
Bukkit.getVersion().contains("1.19") ||
49+
Bukkit.getVersion().contains("1.20") ||
50+
Bukkit.getVersion().contains("1.21")
51+
) {
52+
if (material == Material.BAMBOO_SAPLING) {
53+
return Material.BAMBOO;
6554
}
6655
}
6756
return material;

0 commit comments

Comments
 (0)