Merge remote-tracking branch 'origin/master' into feat/m-1

# Conflicts:
#	type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/event/actions/player/ActionPlayerLaunchPads.java
#	type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/utility/LaunchPads.java

Author: ArikSquad

configuration/skyblock/collections/combat.yml

@@ -17,6 +17,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: FIRE_ASPECT_DISCOUNT
   - amount: 1000
     rewards:
     - type: XP
@@ -332,6 +335,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: GIANT_KILLER_DISCOUNT
   - amount: 1000
     rewards:
     - type: XP
@@ -342,6 +348,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: VAMPIRISM_DISCOUNT
   - amount: 5000
     rewards:
     - type: XP
@@ -410,6 +419,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: THUNDERLORD_DISCOUNT
   - amount: 5000
     rewards:
     - type: XP
@@ -590,6 +602,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: KNOCKBACK_DISCOUNT
   - amount: 1000
     rewards:
     - type: XP
@@ -669,11 +684,17 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: BANE_OF_ARTHROPODS_DISCOUNT
   - amount: 5000
     rewards:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: VENOMOUS_DISCOUNT
   - amount: 10000
     rewards:
     - type: XP

configuration/skyblock/collections/farming.yml

@@ -1044,6 +1044,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: CUBISM_DISCOUNT
   - amount: 2500
     rewards:
     - type: XP

configuration/skyblock/collections/fishing.yml

@@ -314,6 +314,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: IMPALING_DISCOUNT
   - amount: 25
     rewards:
     - type: XP
@@ -383,6 +386,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: CLEAVE_DISCOUNT
   - amount: 150
     rewards:
     - type: XP

configuration/skyblock/collections/mining.yml

@@ -350,6 +350,14 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: FORTUNE_DISCOUNT
+  - amount: 500000
+    rewards:
+      - type: XP
+        data:
+          xp: 4
 - itemType: LAPIS_LAZULI
   rewards:
   - amount: 250
@@ -371,6 +379,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: EXPERIENCE_DISCOUNT
   - amount: 2000
     rewards:
     - type: XP
@@ -497,6 +508,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: EXECUTE_DISCOUNT
   - amount: 250
     rewards:
     - type: XP
@@ -1290,6 +1304,9 @@ collections:
     - type: XP
       data:
         xp: 4
+    - type: CUSTOM_AWARD
+      data:
+        customAward: LETHALITY_DISCOUNT
   - amount: 250
     rewards:
     - type: XP

configuration/skyblock/items/vanilla/blocks/others.yml

@@ -0,0 +1,39 @@
+items:
+  - id: BOOKSHELF
+    material: BOOKSHELF
+    rarity: COMMON
+    components:
+      - id: CUSTOM_DROP
+        rules:
+          - conditions:
+              silk_touch: true
+            drops:
+              - item: BOOKSHELF
+                chance: 1.0
+                amount: 1
+          - conditions:
+            drops:
+              - item: BOOK
+                chance: 1.0
+                amount: 3
+      - id: PLACEABLE
+      - id: SELLABLE
+        value: 20
+      - id: DEFAULT_CRAFTABLE
+        recipes:
+          - type: SHAPED
+            recipe-type: NONE
+            pattern:
+              - AAA
+              - BBB
+              - AAA
+            ingredients:
+              A:
+                type: OAK_PLANKS
+                amount: 1
+              B:
+                type: BOOK
+                amount: 1
+            result:
+              type: BOOKSHELF
+              amount: 1

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/collection/CustomCollectionAward.java

@@ -26,6 +26,18 @@ public enum CustomCollectionAward {
     IMPALING_DISCOUNT("§9Impaling §7Exp Discount §a(-25%)"),
     BANE_OF_ARTHROPODS_DISCOUNT("§9Bane of Arthropods §7Exp Discount §a(-25%)"),
     CUBISM_DISCOUNT("§9Cubism §7Exp Discount §a(-25%)"),
+    FORTUNE_DISCOUNT("§9Fortune §7Exp Discount §a(-25%)"),
+    CLEAVE_DISCOUNT("§9Cleave §7Exp Discount §a(-25%)"),
+    LIFE_STEAL_DISCOUNT("§9Life Steal §7Exp Discount §a(-25%)"),
+    PROSECUTE_DISCOUNT("§9Prosecute §7Exp Discount §a(-25%)"),
+    THUNDERBOLT_DISCOUNT("§9Thunderbolt §7Exp Discount §a(-25%)"),
+    EXPERIENCE_DISCOUNT("§9Experience §7Exp Discount §a(-25%)"),
+    FIRE_ASPECT_DISCOUNT("§9Fire Aspect §7Exp Discount §a(-25%)"),
+    KNOCKBACK_DISCOUNT("§9Knockback §7Exp Discount §a(-25%)"),
+    LETHALITY_DISCOUNT("§9Lethality §7Exp Discount §a(-25%)"),
+    THUNDERLORD_DISCOUNT("§9Thunderlord §7Exp Discount §a(-25%)"),
+    VAMPIRISM_DISCOUNT("§9Vampirism §7Exp Discount §a(-25%)"),
+    VENOMOUS_DISCOUNT("§9Venomous §7Exp Discount §a(-25%)"),
 
     // BAGS
     QUIVER("§aQuiver"),

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/EnchantmentType.java

@@ -9,8 +9,6 @@
 import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.List;
-
 @Getter
 public enum EnchantmentType {
     SHARPNESS(EnchantmentSharpness.class),
@@ -31,17 +29,29 @@ public enum EnchantmentType {
     IMPALING(EnchantmentImpaling.class),
     BANE_OF_ARTHROPODS(EnchantmentBaneOfArthropods.class),
     CUBISM(EnchantmentCubism.class),
+    FORTUNE(EnchantmentFortune.class),
+    CLEAVE(EnchantmentCleave.class),
+    EXPERIENCE(EnchantmentExperience.class),
+    FIRE_ASPECT(EnchantmentFireAspect.class),
+    KNOCKBACK(EnchantmentKnockback.class),
+    LETHALITY(EnchantmentLethality.class),
+    LIFE_STEAL(EnchantmentLifeSteal.class),
+    DRAIN(EnchantmentDrain.class),
+    MANA_STEAL(EnchantmentManaSteal.class),
+    PROSECUTE(EnchantmentProsecute.class),
+    THUNDERBOLT(EnchantmentThunderbolt.class),
+    THUNDERLORD(EnchantmentThunderlord.class),
+    VAMPIRISM(EnchantmentVampirism.class),
+    VENOMOUS(EnchantmentVenomous.class),
+    VICIOUS(EnchantmentVicious.class),
     ;
 
     private final Class<? extends Ench> clazz;
-    private final List<EnchantmentType> conflicts;
-
     private final Ench ench;
 
     @SneakyThrows
-    EnchantmentType(Class<? extends Ench> ench, EnchantmentType... conflicts) {
+    EnchantmentType(Class<? extends Ench> ench) {
         this.clazz = ench;
-        this.conflicts = List.of(conflicts);
 
         this.ench = ench.getConstructor().newInstance();
     }

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/abstr/ConflictingEnch.java

@@ -0,0 +1,9 @@
+package net.swofty.type.skyblockgeneric.enchantment.abstr;
+
+import net.swofty.type.skyblockgeneric.enchantment.EnchantmentType;
+
+import java.util.List;
+
+public interface ConflictingEnch {
+    List<EnchantmentType> getConflictingEnchantments();
+}

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/abstr/DamageEventEnchant.java

@@ -0,0 +1,10 @@
+package net.swofty.type.skyblockgeneric.enchantment.abstr;
+
+import net.minestom.server.entity.LivingEntity;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
+
+public interface DamageEventEnchant {
+    default void onDamageDealt(SkyBlockPlayer player, LivingEntity target, double damageDealt, int level) {
+    }
+}
+

type.skyblockgeneric/src/main/java/net/swofty/type/skyblockgeneric/enchantment/abstr/KillEventEnchant.java

@@ -0,0 +1,9 @@
+package net.swofty.type.skyblockgeneric.enchantment.abstr;
+
+import net.swofty.type.skyblockgeneric.entity.mob.SkyBlockMob;
+import net.swofty.type.skyblockgeneric.user.SkyBlockPlayer;
+
+public interface KillEventEnchant {
+    default void onMobKilled(SkyBlockPlayer player, SkyBlockMob killedMob, int level) {
+    }
+}