Skip to content

Commit 36cad23

Browse files
CrazyDev05CrazyDev05
committed
update materials and item listings
1 parent b1e9d4f commit 36cad23

File tree

6 files changed

+252
-50
lines changed

6 files changed

+252
-50
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/content/item/ItemListings.java‎

Lines changed: 103 additions & 26 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(
@@ -504,7 +527,7 @@ public class ItemListings {
504527
);
505528

506529
@Getter
507-
public static List<Material> axePreference = List.of(
530+
public static List<Material> axePreference = new KList<>(
508531
//FENCES
509532
Material.ACACIA_FENCE,
510533
Material.BIRCH_FENCE,
@@ -515,6 +538,9 @@ public class ItemListings {
515538
Material.OAK_FENCE,
516539
Material.CRIMSON_FENCE,
517540
Material.WARPED_FENCE,
541+
Materials.CHERRY_FENCE,
542+
Materials.BAMBOO_FENCE,
543+
Materials.PALE_OAK_FENCE,
518544
//GATES
519545
Material.ACACIA_FENCE_GATE,
520546
Material.BIRCH_FENCE_GATE,
@@ -525,21 +551,9 @@ public class ItemListings {
525551
Material.OAK_FENCE_GATE,
526552
Material.CRIMSON_FENCE_GATE,
527553
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,
554+
Materials.CHERRY_FENCE_GATE,
555+
Materials.BAMBOO_FENCE_GATE,
556+
Materials.PALE_OAK_FENCE_GATE,
543557
//WOODS
544558
Material.ACACIA_LOG,
545559
Material.ACACIA_WOOD,
@@ -564,26 +578,65 @@ public class ItemListings {
564578
Material.STRIPPED_MANGROVE_LOG,
565579
Material.CRIMSON_STEM,
566580
Material.CRIMSON_HYPHAE,
567-
Material.WARPED_SIGN,
581+
Materials.CHERRY_LOG,
582+
Materials.CHERRY_WOOD,
583+
Materials.STRIPPED_CHERRY_LOG,
584+
Materials.STRIPPED_CHERRY_WOOD,
585+
Materials.BAMBOO_BLOCK,
586+
Materials.STRIPPED_BAMBOO_BLOCK,
587+
Materials.PALE_OAK_LOG,
588+
Materials.PALE_OAK_WOOD,
589+
Materials.STRIPPED_PALE_OAK_LOG,
590+
Materials.STRIPPED_PALE_OAK_WOOD,
568591
//SIGNS
569592
Material.ACACIA_SIGN,
570593
Material.ACACIA_WALL_SIGN,
594+
Materials.ACACIA_HANGING_SIGN,
595+
Materials.ACACIA_WALL_HANGING_SIGN,
571596
Material.BIRCH_SIGN,
572597
Material.BIRCH_WALL_SIGN,
598+
Materials.BIRCH_HANGING_SIGN,
599+
Materials.BIRCH_WALL_HANGING_SIGN,
573600
Material.DARK_OAK_SIGN,
574601
Material.DARK_OAK_WALL_SIGN,
602+
Materials.DARK_OAK_HANGING_SIGN,
603+
Materials.DARK_OAK_WALL_HANGING_SIGN,
575604
Material.JUNGLE_SIGN,
576605
Material.JUNGLE_WALL_SIGN,
606+
Materials.JUNGLE_HANGING_SIGN,
607+
Materials.JUNGLE_WALL_HANGING_SIGN,
577608
Material.OAK_SIGN,
578609
Material.OAK_WALL_SIGN,
610+
Materials.OAK_HANGING_SIGN,
611+
Materials.OAK_WALL_HANGING_SIGN,
579612
Material.SPRUCE_SIGN,
580613
Material.SPRUCE_WALL_SIGN,
614+
Materials.SPRUCE_HANGING_SIGN,
615+
Materials.SPRUCE_WALL_HANGING_SIGN,
581616
Material.MANGROVE_SIGN,
582617
Material.MANGROVE_WALL_SIGN,
618+
Materials.MANGROVE_HANGING_SIGN,
619+
Materials.MANGROVE_WALL_HANGING_SIGN,
583620
Material.CRIMSON_SIGN,
584621
Material.CRIMSON_WALL_SIGN,
622+
Materials.CRIMSON_HANGING_SIGN,
623+
Materials.CRIMSON_WALL_HANGING_SIGN,
585624
Material.WARPED_SIGN,
586625
Material.WARPED_WALL_SIGN,
626+
Materials.WARPED_HANGING_SIGN,
627+
Materials.WARPED_WALL_HANGING_SIGN,
628+
Materials.CHERRY_SIGN,
629+
Materials.CHERRY_WALL_SIGN,
630+
Materials.CHERRY_HANGING_SIGN,
631+
Materials.CHERRY_WALL_HANGING_SIGN,
632+
Materials.BAMBOO_SIGN,
633+
Materials.BAMBOO_WALL_SIGN,
634+
Materials.BAMBOO_HANGING_SIGN,
635+
Materials.BAMBOO_WALL_HANGING_SIGN,
636+
Materials.PALE_OAK_SIGN,
637+
Materials.PALE_OAK_WALL_SIGN,
638+
Materials.PALE_OAK_HANGING_SIGN,
639+
Materials.PALE_OAK_WALL_HANGING_SIGN,
587640
//WOODEN_BUTTONS
588641
Material.ACACIA_BUTTON,
589642
Material.BIRCH_BUTTON,
@@ -594,6 +647,9 @@ public class ItemListings {
594647
Material.MANGROVE_BUTTON,
595648
Material.CRIMSON_BUTTON,
596649
Material.WARPED_BUTTON,
650+
Materials.CHERRY_BUTTON,
651+
Materials.BAMBOO_BUTTON,
652+
Materials.PALE_OAK_BUTTON,
597653
//WOODEN_DOORS
598654
Material.ACACIA_DOOR,
599655
Material.BIRCH_DOOR,
@@ -604,6 +660,9 @@ public class ItemListings {
604660
Material.MANGROVE_DOOR,
605661
Material.CRIMSON_DOOR,
606662
Material.WARPED_DOOR,
663+
Materials.CHERRY_DOOR,
664+
Materials.BAMBOO_DOOR,
665+
Materials.PALE_OAK_DOOR,
607666
//WOODEN_PRESSURE_PLATES
608667
Material.ACACIA_PRESSURE_PLATE,
609668
Material.BIRCH_PRESSURE_PLATE,
@@ -614,6 +673,9 @@ public class ItemListings {
614673
Material.MANGROVE_PRESSURE_PLATE,
615674
Material.CRIMSON_PRESSURE_PLATE,
616675
Material.WARPED_PRESSURE_PLATE,
676+
Materials.CHERRY_PRESSURE_PLATE,
677+
Materials.BAMBOO_PRESSURE_PLATE,
678+
Materials.PALE_OAK_PRESSURE_PLATE,
617679
//WOODEN_TRAPDOORS
618680
Material.ACACIA_TRAPDOOR,
619681
Material.BIRCH_TRAPDOOR,
@@ -624,6 +686,9 @@ public class ItemListings {
624686
Material.MANGROVE_TRAPDOOR,
625687
Material.CRIMSON_TRAPDOOR,
626688
Material.WARPED_TRAPDOOR,
689+
Materials.CHERRY_TRAPDOOR,
690+
Materials.BAMBOO_TRAPDOOR,
691+
Materials.PALE_OAK_TRAPDOOR,
627692
//WOODEN_STAIRS
628693
Material.ACACIA_STAIRS,
629694
Material.BIRCH_STAIRS,
@@ -634,6 +699,10 @@ public class ItemListings {
634699
Material.MANGROVE_STAIRS,
635700
Material.CRIMSON_STAIRS,
636701
Material.WARPED_STAIRS,
702+
Materials.CHERRY_STAIRS,
703+
Materials.BAMBOO_STAIRS,
704+
Materials.BAMBOO_MOSAIC_STAIRS,
705+
Materials.PALE_OAK_STAIRS,
637706
//WOODEN_SLABS
638707
Material.ACACIA_SLAB,
639708
Material.BIRCH_SLAB,
@@ -644,6 +713,10 @@ public class ItemListings {
644713
Material.MANGROVE_SLAB,
645714
Material.CRIMSON_SLAB,
646715
Material.WARPED_SLAB,
716+
Materials.CHERRY_SLAB,
717+
Materials.BAMBOO_SLAB,
718+
Materials.BAMBOO_MOSAIC_SLAB,
719+
Materials.PALE_OAK_SLAB,
647720
//PLANKS
648721
Material.ACACIA_PLANKS,
649722
Material.BIRCH_PLANKS,
@@ -654,6 +727,10 @@ public class ItemListings {
654727
Material.MANGROVE_PLANKS,
655728
Material.CRIMSON_PLANKS,
656729
Material.WARPED_PLANKS,
730+
Materials.CHERRY_PLANKS,
731+
Materials.BAMBOO_PLANKS,
732+
Materials.BAMBOO_MOSAIC,
733+
Materials.PALE_OAK_PLANKS,
657734
//MISC
658735
Material.BEE_NEST,
659736
Material.DRIED_KELP_BLOCK,
@@ -677,5 +754,5 @@ public class ItemListings {
677754
Material.PUMPKIN,
678755
Material.MELON,
679756
Material.TRAPPED_CHEST
680-
);
757+
).nonNull();
681758
}

‎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)