Skip to content

Commit d826111

Browse files
AvianAeternumAvianAeternum
authored
Merge pull request #546 from VolmitSoftware/Development
1.16.8
2 parents b1e9d4f + 1746fcf commit d826111

File tree

7 files changed

+258
-52
lines changed

7 files changed

+258
-52
lines changed

‎src/main/java/com/volmit/adapt/api/world/AdaptComponent.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ default boolean isMelee(ItemStack is) {
5151
}
5252

5353
default boolean isMace(ItemStack is) {
54-
return is.getType().getKey().equals(Materials.MACE_KEY);
54+
return is.getType() == Materials.MACE;
5555
}
5656

5757
default boolean isShield(ItemStack is) {

‎src/main/java/com/volmit/adapt/api/world/AdaptPlayer.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class AdaptPlayer extends TickedObject {
5151
private long lastloc;
5252
private Vector velocity;
5353
private Location lastpos;
54-
private long lastSeen = -1;
54+
private long lastSeen;
5555

5656
public AdaptPlayer(Player p) {
5757
super("players", p.getUniqueId().toString(), 50);
@@ -64,6 +64,7 @@ public AdaptPlayer(Player p) {
6464
advancementHandler = new AdvancementHandler(this);
6565
speed = new RollingSequence(7);
6666
lastloc = M.ms();
67+
lastSeen = M.ms();
6768
velocity = new Vector();
6869
}
6970

‎src/main/java/com/volmit/adapt/content/item/ItemListings.java‎

Lines changed: 107 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020

2121
import com.volmit.adapt.api.version.Version;
2222
import com.volmit.adapt.util.C;
23+
import com.volmit.adapt.util.collection.KList;
24+
import com.volmit.adapt.util.reflect.registries.Materials;
2325
import lombok.Getter;
2426
import org.bukkit.ChatColor;
2527
import org.bukkit.Material;
@@ -31,16 +33,18 @@
3133
public class ItemListings {
3234

3335
@Getter
34-
public static final List<Material> shearList = List.of(
36+
public static final List<Material> shearList = new KList<>(
3537
Material.ACACIA_LEAVES,
3638
Material.AZALEA_LEAVES,
3739
Material.BIRCH_LEAVES,
3840
Material.DARK_OAK_LEAVES,
3941
Material.JUNGLE_LEAVES,
4042
Material.OAK_LEAVES,
4143
Material.SPRUCE_LEAVES,
42-
Material.MANGROVE_LEAVES
43-
);
44+
Material.MANGROVE_LEAVES,
45+
Materials.CHERRY_LEAVES,
46+
Materials.PALE_OAK_LEAVES
47+
).nonNull();
4448

4549
@Getter
4650
public static final List<EntityType> invalidDamageableEntities = Version.get().getInvalidDamageableEntities();
@@ -215,31 +219,48 @@ public class ItemListings {
215219
);
216220

217221
@Getter
218-
public static List<Material> stripList = List.of(
222+
public static List<Material> stripList = new KList<>(
219223
Material.ACACIA_LOG,
220224
Material.ACACIA_WOOD,
221225
Material.STRIPPED_ACACIA_LOG,
226+
Material.STRIPPED_ACACIA_WOOD,
222227
Material.BIRCH_LOG,
223228
Material.BIRCH_WOOD,
224229
Material.STRIPPED_BIRCH_LOG,
230+
Material.STRIPPED_BIRCH_WOOD,
225231
Material.DARK_OAK_LOG,
226232
Material.DARK_OAK_WOOD,
227233
Material.STRIPPED_DARK_OAK_LOG,
234+
Material.STRIPPED_DARK_OAK_WOOD,
228235
Material.JUNGLE_LOG,
229236
Material.JUNGLE_WOOD,
230237
Material.STRIPPED_JUNGLE_LOG,
238+
Material.STRIPPED_JUNGLE_WOOD,
231239
Material.OAK_LOG,
232240
Material.OAK_WOOD,
233241
Material.STRIPPED_OAK_LOG,
242+
Material.STRIPPED_OAK_WOOD,
234243
Material.SPRUCE_LOG,
235244
Material.SPRUCE_WOOD,
236245
Material.STRIPPED_SPRUCE_LOG,
246+
Material.STRIPPED_SPRUCE_WOOD,
237247
Material.MANGROVE_LOG,
238248
Material.MANGROVE_WOOD,
239249
Material.STRIPPED_MANGROVE_LOG,
250+
Material.STRIPPED_MANGROVE_WOOD,
240251
Material.CRIMSON_STEM,
241-
Material.CRIMSON_HYPHAE
242-
);
252+
Material.CRIMSON_HYPHAE,
253+
Materials.CHERRY_LOG,
254+
Materials.CHERRY_WOOD,
255+
Materials.STRIPPED_CHERRY_LOG,
256+
Materials.STRIPPED_CHERRY_WOOD,
257+
Materials.BAMBOO_BLOCK,
258+
Materials.STRIPPED_BAMBOO_BLOCK,
259+
Materials.PALE_OAK_LOG,
260+
Materials.PALE_OAK_WOOD,
261+
Materials.STRIPPED_PALE_OAK_LOG,
262+
Materials.STRIPPED_PALE_OAK_WOOD
263+
).nonNull();
243264

244265

245266
@Getter
@@ -285,7 +306,7 @@ public class ItemListings {
285306
);
286307

287308
@Getter
288-
public static List<Material> burnable = List.of(
309+
public static List<Material> burnable = new KList<>(
289310
Material.OBSIDIAN,
290311
Material.NETHERRACK,
291312
Material.SOUL_SAND,
@@ -296,6 +317,8 @@ public class ItemListings {
296317
Material.OAK_LEAVES,
297318
Material.SPRUCE_LEAVES,
298319
Material.MANGROVE_LEAVES,
320+
Materials.CHERRY_LEAVES,
321+
Materials.PALE_OAK_LEAVES,
299322
Material.WHITE_WOOL,
300323
Material.ORANGE_WOOL,
301324
Material.MAGENTA_WOOL,
@@ -312,7 +335,7 @@ public class ItemListings {
312335
Material.GREEN_WOOL,
313336
Material.RED_WOOL,
314337
Material.BLACK_WOOL
315-
);
338+
).nonNull();
316339

317340
@Getter
318341
public static List<Material> toolPickaxes = List.of(
@@ -415,11 +438,14 @@ public class ItemListings {
415438
Material.MYCELIUM,
416439
Material.SAND,
417440
Material.SOUL_SAND,
441+
Material.SOUL_SOIL,
418442
Material.SNOW,
419443
Material.SNOW_BLOCK,
420444
Material.POWDER_SNOW,
421445
Material.PODZOL,
422-
Material.RED_SAND
446+
Material.RED_SAND,
447+
Material.MUD,
448+
Material.MUDDY_MANGROVE_ROOTS
423449
);
424450

425451
@Getter
@@ -504,7 +530,7 @@ public class ItemListings {
504530
);
505531

506532
@Getter
507-
public static List<Material> axePreference = List.of(
533+
public static List<Material> axePreference = new KList<>(
508534
//FENCES
509535
Material.ACACIA_FENCE,
510536
Material.BIRCH_FENCE,
@@ -515,6 +541,9 @@ public class ItemListings {
515541
Material.OAK_FENCE,
516542
Material.CRIMSON_FENCE,
517543
Material.WARPED_FENCE,
544+
Materials.CHERRY_FENCE,
545+
Materials.BAMBOO_FENCE,
546+
Materials.PALE_OAK_FENCE,
518547
//GATES
519548
Material.ACACIA_FENCE_GATE,
520549
Material.BIRCH_FENCE_GATE,
@@ -525,21 +554,9 @@ public class ItemListings {
525554
Material.OAK_FENCE_GATE,
526555
Material.CRIMSON_FENCE_GATE,
527556
Material.WARPED_FENCE_GATE,
528-
//SIGNS
529-
Material.ACACIA_SIGN,
530-
Material.ACACIA_WALL_SIGN,
531-
Material.BIRCH_SIGN,
532-
Material.BIRCH_WALL_SIGN,
533-
Material.DARK_OAK_SIGN,
534-
Material.DARK_OAK_WALL_SIGN,
535-
Material.JUNGLE_SIGN,
536-
Material.JUNGLE_WALL_SIGN,
537-
Material.OAK_SIGN,
538-
Material.OAK_WALL_SIGN,
539-
Material.SPRUCE_SIGN,
540-
Material.SPRUCE_WALL_SIGN,
541-
Material.MANGROVE_SIGN,
542-
Material.MANGROVE_WALL_SIGN,
557+
Materials.CHERRY_FENCE_GATE,
558+
Materials.BAMBOO_FENCE_GATE,
559+
Materials.PALE_OAK_FENCE_GATE,
543560
//WOODS
544561
Material.ACACIA_LOG,
545562
Material.ACACIA_WOOD,
@@ -564,26 +581,65 @@ public class ItemListings {
564581
Material.STRIPPED_MANGROVE_LOG,
565582
Material.CRIMSON_STEM,
566583
Material.CRIMSON_HYPHAE,
567-
Material.WARPED_SIGN,
584+
Materials.CHERRY_LOG,
585+
Materials.CHERRY_WOOD,
586+
Materials.STRIPPED_CHERRY_LOG,
587+
Materials.STRIPPED_CHERRY_WOOD,
588+
Materials.BAMBOO_BLOCK,
589+
Materials.STRIPPED_BAMBOO_BLOCK,
590+
Materials.PALE_OAK_LOG,
591+
Materials.PALE_OAK_WOOD,
592+
Materials.STRIPPED_PALE_OAK_LOG,
593+
Materials.STRIPPED_PALE_OAK_WOOD,
568594
//SIGNS
569595
Material.ACACIA_SIGN,
570596
Material.ACACIA_WALL_SIGN,
597+
Materials.ACACIA_HANGING_SIGN,
598+
Materials.ACACIA_WALL_HANGING_SIGN,
571599
Material.BIRCH_SIGN,
572600
Material.BIRCH_WALL_SIGN,
601+
Materials.BIRCH_HANGING_SIGN,
602+
Materials.BIRCH_WALL_HANGING_SIGN,
573603
Material.DARK_OAK_SIGN,
574604
Material.DARK_OAK_WALL_SIGN,
605+
Materials.DARK_OAK_HANGING_SIGN,
606+
Materials.DARK_OAK_WALL_HANGING_SIGN,
575607
Material.JUNGLE_SIGN,
576608
Material.JUNGLE_WALL_SIGN,
609+
Materials.JUNGLE_HANGING_SIGN,
610+
Materials.JUNGLE_WALL_HANGING_SIGN,
577611
Material.OAK_SIGN,
578612
Material.OAK_WALL_SIGN,
613+
Materials.OAK_HANGING_SIGN,
614+
Materials.OAK_WALL_HANGING_SIGN,
579615
Material.SPRUCE_SIGN,
580616
Material.SPRUCE_WALL_SIGN,
617+
Materials.SPRUCE_HANGING_SIGN,
618+
Materials.SPRUCE_WALL_HANGING_SIGN,
581619
Material.MANGROVE_SIGN,
582620
Material.MANGROVE_WALL_SIGN,
621+
Materials.MANGROVE_HANGING_SIGN,
622+
Materials.MANGROVE_WALL_HANGING_SIGN,
583623
Material.CRIMSON_SIGN,
584624
Material.CRIMSON_WALL_SIGN,
625+
Materials.CRIMSON_HANGING_SIGN,
626+
Materials.CRIMSON_WALL_HANGING_SIGN,
585627
Material.WARPED_SIGN,
586628
Material.WARPED_WALL_SIGN,
629+
Materials.WARPED_HANGING_SIGN,
630+
Materials.WARPED_WALL_HANGING_SIGN,
631+
Materials.CHERRY_SIGN,
632+
Materials.CHERRY_WALL_SIGN,
633+
Materials.CHERRY_HANGING_SIGN,
634+
Materials.CHERRY_WALL_HANGING_SIGN,
635+
Materials.BAMBOO_SIGN,
636+
Materials.BAMBOO_WALL_SIGN,
637+
Materials.BAMBOO_HANGING_SIGN,
638+
Materials.BAMBOO_WALL_HANGING_SIGN,
639+
Materials.PALE_OAK_SIGN,
640+
Materials.PALE_OAK_WALL_SIGN,
641+
Materials.PALE_OAK_HANGING_SIGN,
642+
Materials.PALE_OAK_WALL_HANGING_SIGN,
587643
//WOODEN_BUTTONS
588644
Material.ACACIA_BUTTON,
589645
Material.BIRCH_BUTTON,
@@ -594,6 +650,9 @@ public class ItemListings {
594650
Material.MANGROVE_BUTTON,
595651
Material.CRIMSON_BUTTON,
596652
Material.WARPED_BUTTON,
653+
Materials.CHERRY_BUTTON,
654+
Materials.BAMBOO_BUTTON,
655+
Materials.PALE_OAK_BUTTON,
597656
//WOODEN_DOORS
598657
Material.ACACIA_DOOR,
599658
Material.BIRCH_DOOR,
@@ -604,6 +663,9 @@ public class ItemListings {
604663
Material.MANGROVE_DOOR,
605664
Material.CRIMSON_DOOR,
606665
Material.WARPED_DOOR,
666+
Materials.CHERRY_DOOR,
667+
Materials.BAMBOO_DOOR,
668+
Materials.PALE_OAK_DOOR,
607669
//WOODEN_PRESSURE_PLATES
608670
Material.ACACIA_PRESSURE_PLATE,
609671
Material.BIRCH_PRESSURE_PLATE,
@@ -614,6 +676,9 @@ public class ItemListings {
614676
Material.MANGROVE_PRESSURE_PLATE,
615677
Material.CRIMSON_PRESSURE_PLATE,
616678
Material.WARPED_PRESSURE_PLATE,
679+
Materials.CHERRY_PRESSURE_PLATE,
680+
Materials.BAMBOO_PRESSURE_PLATE,
681+
Materials.PALE_OAK_PRESSURE_PLATE,
617682
//WOODEN_TRAPDOORS
618683
Material.ACACIA_TRAPDOOR,
619684
Material.BIRCH_TRAPDOOR,
@@ -624,6 +689,9 @@ public class ItemListings {
624689
Material.MANGROVE_TRAPDOOR,
625690
Material.CRIMSON_TRAPDOOR,
626691
Material.WARPED_TRAPDOOR,
692+
Materials.CHERRY_TRAPDOOR,
693+
Materials.BAMBOO_TRAPDOOR,
694+
Materials.PALE_OAK_TRAPDOOR,
627695
//WOODEN_STAIRS
628696
Material.ACACIA_STAIRS,
629697
Material.BIRCH_STAIRS,
@@ -634,6 +702,10 @@ public class ItemListings {
634702
Material.MANGROVE_STAIRS,
635703
Material.CRIMSON_STAIRS,
636704
Material.WARPED_STAIRS,
705+
Materials.CHERRY_STAIRS,
706+
Materials.BAMBOO_STAIRS,
707+
Materials.BAMBOO_MOSAIC_STAIRS,
708+
Materials.PALE_OAK_STAIRS,
637709
//WOODEN_SLABS
638710
Material.ACACIA_SLAB,
639711
Material.BIRCH_SLAB,
@@ -644,6 +716,10 @@ public class ItemListings {
644716
Material.MANGROVE_SLAB,
645717
Material.CRIMSON_SLAB,
646718
Material.WARPED_SLAB,
719+
Materials.CHERRY_SLAB,
720+
Materials.BAMBOO_SLAB,
721+
Materials.BAMBOO_MOSAIC_SLAB,
722+
Materials.PALE_OAK_SLAB,
647723
//PLANKS
648724
Material.ACACIA_PLANKS,
649725
Material.BIRCH_PLANKS,
@@ -654,6 +730,10 @@ public class ItemListings {
654730
Material.MANGROVE_PLANKS,
655731
Material.CRIMSON_PLANKS,
656732
Material.WARPED_PLANKS,
733+
Materials.CHERRY_PLANKS,
734+
Materials.BAMBOO_PLANKS,
735+
Materials.BAMBOO_MOSAIC,
736+
Materials.PALE_OAK_PLANKS,
657737
//MISC
658738
Material.BEE_NEST,
659739
Material.DRIED_KELP_BLOCK,
@@ -677,5 +757,5 @@ public class ItemListings {
677757
Material.PUMPKIN,
678758
Material.MELON,
679759
Material.TRAPPED_CHEST
680-
);
760+
).nonNull();
681761
}

‎src/main/java/com/volmit/adapt/util/collection/KList.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,10 @@ public KList<T> removeDuplicates() {
671671
return m;
672672
}
673673

674+
public KList<T> nonNull() {
675+
return removeWhere(Objects::isNull);
676+
}
677+
674678
public boolean addIfMissing(T t) {
675679
if (!contains(t)) {
676680
add(t);

‎src/main/java/com/volmit/adapt/util/data/B.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ private static IntSet buildFoliageCache() {
7979
JUNGLE_SAPLING,
8080
BIRCH_SAPLING,
8181
SPRUCE_SAPLING,
82+
Materials.CHERRY_SAPLING,
83+
Materials.PALE_OAK_SAPLING,
8284
OAK_SAPLING,
8385
ORANGE_TULIP,
8486
PINK_TULIP,

0 commit comments

Comments
 (0)