feat: massively reworked item drops

Took 1 hour 7 minutes

Author: Swofty-Developments

commons/src/main/java/net/swofty/commons/item/ItemType.java

@@ -595,6 +595,7 @@ public enum ItemType {
     /**
      * Shovels
      */
+    SHEARS(Material.SHEARS,  Rarity.COMMON),
     WOODEN_SHOVEL(Material.WOODEN_SHOVEL,  Rarity.COMMON),
     STONE_SHOVEL(Material.STONE_SHOVEL,  Rarity.COMMON),
     GOLDEN_SHOVEL(Material.GOLDEN_SHOVEL,  Rarity.COMMON),

configuration/items/mining/vanilla.yml

@@ -299,6 +299,20 @@ items:
   - id: GOLD_ORE
     rarity: COMMON
     components:
+      - id: CUSTOM_DROP
+        rules:
+          - conditions:
+              silk_touch: false
+            drops:
+              - item: GOLD_INGOT
+                chance: 1.0
+                amount: "2-5"
+          - conditions:
+              silk_touch: true
+            drops:
+              - item: GOLD_ORE
+                chance: 1.0
+                amount: 1
       - id: PLACEABLE
       - id: SKILLABLE_MINE
         category: MINING

configuration/items/vanillaItems.yml

@@ -6,6 +6,26 @@ items:
       - id: PLACEABLE
       - id: SELLABLE
         value: 1.0
+  - id: SHORT_GRASS
+    rarity: COMMON
+    material: SHORT_GRASS
+    components:
+      - id: CUSTOM_DROP
+        rules:
+          - conditions:
+              silk_touch: false
+            drops:
+              - item: WHEAT_SEEDS
+                chance: 0.125
+                amount: 1
+              # No grass block drop without silk touch
+          - conditions:
+              silk_touch: true
+            drops:
+              - item: SHORT_GRASS
+                chance: 1.0
+                amount: 1
+      - id: PLACEABLE
   - id: GRASS_BLOCK
     material: GRASS_BLOCK
     rarity: COMMON
@@ -480,10 +500,67 @@ items:
             result:
               type: CYAN_STAINED_GLASS
               amount: 8
+  - id: OAK_LEAVES
+    rarity: COMMON
+    material: oak_leaves
+    components:
+      - id: CUSTOM_DROP
+        rules:
+          # Silk touch rule - always gives leaves (highest priority)
+          - conditions:
+              silk_touch: true
+            drops:
+              - item: OAK_LEAVES
+                chance: 1.0
+                amount: 1
+          # Shears rule - gives leaves + normal drops
+          - conditions:
+              broken_with: SHEARS
+            drops:
+              - item: OAK_LEAVES
+                chance: 1.0
+                amount: 1
+              - item: OAK_SAPLING
+                chance: 0.05
+                amount: 1
+              - item: STICK
+                chance: 0.02
+                amount: "1-2"
+              - item: APPLE
+                chance: 0.005
+                amount: 1
+          # Default rule - no shears, no silk touch
+          - conditions:
+              silk_touch: false
+              broken_with_not: SHEARS
+            drops:
+              - item: OAK_SAPLING
+                chance: 0.05
+                amount: 1
+              - item: STICK
+                chance: 0.02
+                amount: "1-2"
+              - item: APPLE
+                chance: 0.005
+                amount: 1
+      - id: PLACEABLE
   - id: GLASS
     material: GLASS
     rarity: COMMON
     components:
+      - id: CUSTOM_DROP
+        rules:
+          # No silk touch = no drops
+          - conditions:
+              silk_touch: false
+            drops: [ ]
+          # Silk touch = get glass back
+          - conditions:
+              silk_touch: true
+            drops:
+              - item: GLASS
+                chance: 1.0
+                amount: 1
       - id: PLACEABLE
       - id: SELLABLE
         value: 3.0

configuration/settings.yml

@@ -90,7 +90,7 @@ title:
 # Don't use secret if you not use MODERN type
 infoForwarding:
   type: MODERN
-  secret: '9KfeURi1losL'
+  secret: 'ixmSUgWOgvs7'
   tokens:
     - '<BUNGEE_GUARD_TOKEN>'
 

loader/src/main/java/net/swofty/loader/SkyBlock.java

@@ -58,7 +58,7 @@ public static void main(String[] args) {
         ServerType serverType = ServerType.valueOf(args[0].toUpperCase());
         long startTime = System.currentTimeMillis();
 
-        boolean isPterodactyl = Configuration.getOrDefault("pterodactyl-mode" , false);
+        boolean isPterodactyl = Configuration.getOrDefault("pterodaddctyl-mode" , false);
 
         if (isPterodactyl && args.length < 2) {
             Logger.error("Please specify server port.");

type.generic/src/main/java/net/swofty/types/generic/enchantment/EnchantmentType.java

@@ -24,6 +24,7 @@ public enum EnchantmentType {
     LOOTING(EnchantmentLooting.class),
     ENDER_SLAYER(EnchantmentEnderSlayer.class),
     SMITE(EnchantmentSmite.class),
+    SILK_TOUCH(EnchantmentSilkTouch.class),
     ;
 
     private final Class<? extends Ench> clazz;

type.generic/src/main/java/net/swofty/types/generic/enchantment/impl/EnchantmentSilkTouch.java

@@ -0,0 +1,49 @@
+package net.swofty.types.generic.enchantment.impl;
+
+import lombok.NonNull;
+import net.swofty.types.generic.collection.CustomCollectionAward;
+import net.swofty.types.generic.enchantment.abstr.Ench;
+import net.swofty.types.generic.enchantment.abstr.EnchFromTable;
+import net.swofty.types.generic.user.SkyBlockPlayer;
+import net.swofty.types.generic.utility.groups.EnchantItemGroups;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class EnchantmentSilkTouch implements Ench, EnchFromTable {
+
+    @Override
+    public String getDescription(int level) {
+        return "§7Allows you to mine blocks in their original form.";
+    }
+
+    @Override
+    public ApplyLevels getLevelsToApply(@NonNull SkyBlockPlayer player) {
+        HashMap<Integer, Integer> levels = new HashMap<>(Map.of(
+                1, 64
+        ));
+        return new ApplyLevels(levels);
+    }
+
+    @Override
+    public List<EnchantItemGroups> getGroups() {
+        return List.of(
+                EnchantItemGroups.PICKAXE,
+                EnchantItemGroups.TOOLS
+        );
+    }
+
+    @Override
+    public TableLevels getLevelsFromTableToApply(@NonNull SkyBlockPlayer player) {
+        HashMap<Integer, Integer> levels = new HashMap<>(Map.of(
+                1, 30
+        ));
+        return new TableLevels(levels);
+    }
+
+    @Override
+    public int getRequiredBookshelfPower() {
+        return 15;
+    }
+}

type.generic/src/main/java/net/swofty/types/generic/event/actions/player/gui/ActionPlayerInteractWithCrafting.java

@@ -1,6 +1,7 @@
 package net.swofty.types.generic.event.actions.player.gui;
 
 import net.minestom.server.event.inventory.InventoryPreClickEvent;
+import net.minestom.server.inventory.PlayerInventory;
 import net.minestom.server.inventory.click.ClickType;
 import net.minestom.server.item.ItemStack;
 import net.swofty.types.generic.event.EventNodes;
@@ -16,7 +17,7 @@ public class ActionPlayerInteractWithCrafting implements SkyBlockEventClass {
     public void run(InventoryPreClickEvent event) {
         SkyBlockPlayer player = (SkyBlockPlayer) event.getPlayer();
 
-        if (event.getInventory() != null) return;
+        if (!(event.getInventory() instanceof PlayerInventory)) return;
         if (event.getSlot() < 37 || event.getSlot() > 40) return;
 
         if (!event.getClickType().equals(ClickType.CHANGE_HELD)) // Fix dupe glitches by numkeying items into recipe grid

type.generic/src/main/java/net/swofty/types/generic/event/actions/player/region/ActionRegionBlockBreak.java

@@ -11,8 +11,8 @@
 import net.swofty.types.generic.event.EventNodes;
 import net.swofty.types.generic.event.SkyBlockEventClass;
 import net.swofty.types.generic.event.SkyBlockEventHandler;
-import net.swofty.types.generic.item.ItemDropChanger;
 import net.swofty.types.generic.item.SkyBlockItem;
+import net.swofty.types.generic.item.components.CustomDropComponent;
 import net.swofty.types.generic.region.RegionType;
 import net.swofty.types.generic.region.SkyBlockMiningConfiguration;
 import net.swofty.types.generic.region.SkyBlockRegion;
@@ -21,6 +21,8 @@
 import net.swofty.types.generic.event.SkyBlockEvent;
 import net.swofty.types.generic.event.custom.CustomBlockBreakEvent;
 
+import java.util.List;
+
 public class ActionRegionBlockBreak implements SkyBlockEventClass {
 
     @SkyBlockEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
@@ -68,74 +70,85 @@ else if (region != null) {
 
         // Handle item drops for valid breaks
         if (material != null && shouldItemDrop) {
-            // Determine which item should be dropped
-            SkyBlockItem item = ItemDropChanger.get(material) != null ?
-                    ItemDropChanger.get(material).getItemSupplier().get() :
-                    new SkyBlockItem(material);
+            SkyBlockItem brokenBlockItem = new SkyBlockItem(material);
+
+            // Determine which item(s) should be dropped using CustomDropComponent
+            List<SkyBlockItem> customDrops = CustomDropComponent.simulateDrop(
+                    brokenBlockItem,
+                    player,
+                    new SkyBlockItem(player.getItemInMainHand()),
+                    region,
+                    SkyBlockConst.isIslandServer()
+            );
 
             // Call custom break event
             SkyBlockEventHandler.callSkyBlockEvent(new CustomBlockBreakEvent(
-                    player, item.getMaterial(), event.getBlockPosition()
+                    player, material, event.getBlockPosition(), customDrops
             ));
 
-            // Calculate drop amount with fortune multiplier
-            int dropAmount;
-            try {
-                MineableBlock mineableBlock = MineableBlock.get(block);
-                double baseFortune = player.getStatistics().allStatistics().getOverall(mineableBlock.getBlockType().baseSkillFortune()); //might need to return 100 if null
-                double specificFortune = player.getStatistics().allStatistics().getOverall(mineableBlock.getBlockType().specificBlockFortune());
-                double fortune = baseFortune + specificFortune;
-                double dropMultiplicator = (1 + (fortune * 0.01));
-                dropAmount = mineableBlock.getDrops().getAmount(dropMultiplicator);
-            } catch (NullPointerException e) {
-                dropAmount = 1;
-            }
+            // Process each drop with fortune multiplier
+            for (SkyBlockItem dropItem : customDrops) {
+                // Calculate drop amount with fortune multiplier
+                int dropAmount = dropItem.getAmount(); // Base amount from CustomDropComponent
+
+                try {
+                    MineableBlock mineableBlock = MineableBlock.get(block);
+                    if (mineableBlock != null) {
+                        double baseFortune = player.getStatistics().allStatistics().getOverall(mineableBlock.getBlockType().baseSkillFortune());
+                        double specificFortune = player.getStatistics().allStatistics().getOverall(mineableBlock.getBlockType().specificBlockFortune());
+                        double fortune = baseFortune + specificFortune;
+                        double dropMultiplier = (1 + (fortune * 0.01));
+                        dropAmount = (int) Math.ceil(dropAmount * dropMultiplier);
+                    }
+                } catch (NullPointerException e) {
+                    // Keep base amount if fortune calculation fails
+                }
 
-            // Create the item to be given to the player
-            SkyBlockItem skyBlockItem = new SkyBlockItem(item.getItemStackBuilder().amount(dropAmount).build());
-            ItemType droppedItemType = skyBlockItem.getAttributeHandler().getPotentialType();
-
-// Handle item distribution based on player conditions
-            if (player.canInsertItemIntoSacks(droppedItemType, dropAmount)) {
-                player.getSackItems().increase(droppedItemType, dropAmount);
-            } else if (player.getSkyBlockExperience().getLevel().asInt() >= 6) {
-                player.addAndUpdateItem(skyBlockItem);
-            } else {
-                // Determine nearest air block between ore and player
-                Pos orePos = Pos.fromPoint(event.getBlockPosition());
-                Pos playerPos = player.getPosition();
-
-                Pos[] offsets = {
-                        new Pos(1, 0, 0), new Pos(-1, 0, 0),
-                        new Pos(0, 1, 0), new Pos(0, -1, 0),
-                        new Pos(0, 0, 1), new Pos(0, 0, -1)
-                };
-
-                Pos nearestAirBlock = null;
-                double closestDistanceSquared = Double.MAX_VALUE;
-
-                for (Pos offset : offsets) {
-                    Pos adjacentPos = orePos.add(offset);
-                    Block block2 = player.getInstance().getBlock(adjacentPos);
-
-                    if (block2.isAir()) {
-                        double distanceSquared = adjacentPos.distanceSquared(playerPos);
-                        if (distanceSquared < closestDistanceSquared) {
-                            closestDistanceSquared = distanceSquared;
-                            nearestAirBlock = adjacentPos;
+                // Update the drop item amount
+                dropItem.setAmount(dropAmount);
+                ItemType droppedItemType = dropItem.getAttributeHandler().getPotentialType();
+
+                // Handle item distribution based on player conditions
+                if (player.canInsertItemIntoSacks(droppedItemType, dropAmount)) {
+                    player.getSackItems().increase(droppedItemType, dropAmount);
+                } else if (player.getSkyBlockExperience().getLevel().asInt() >= 6) {
+                    player.addAndUpdateItem(dropItem);
+                } else {
+                    // Determine nearest air block between ore and player
+                    Pos orePos = Pos.fromPoint(event.getBlockPosition());
+                    Pos playerPos = player.getPosition();
+
+                    Pos[] offsets = {
+                            new Pos(1, 0, 0), new Pos(-1, 0, 0),
+                            new Pos(0, 1, 0), new Pos(0, -1, 0),
+                            new Pos(0, 0, 1), new Pos(0, 0, -1)
+                    };
+
+                    Pos nearestAirBlock = null;
+                    double closestDistanceSquared = Double.MAX_VALUE;
+
+                    for (Pos offset : offsets) {
+                        Pos adjacentPos = orePos.add(offset);
+                        Block block2 = player.getInstance().getBlock(adjacentPos);
+
+                        if (block2.isAir()) {
+                            double distanceSquared = adjacentPos.distanceSquared(playerPos);
+                            if (distanceSquared < closestDistanceSquared) {
+                                closestDistanceSquared = distanceSquared;
+                                nearestAirBlock = adjacentPos;
+                            }
                         }
                     }
-                }
 
-                // Use the nearest air block or fallback to default position
-                Pos dropPos = (nearestAirBlock != null) ? nearestAirBlock.add(0.5, 0.5, 0.5) : orePos.add(0.5, 1.5, 0.5);
+                    // Use the nearest air block or fallback to default position
+                    Pos dropPos = (nearestAirBlock != null) ? nearestAirBlock.add(0.5, 0.5, 0.5) : orePos.add(0.5, 1.5, 0.5);
 
-                // Spawn the item
-                DroppedItemEntityImpl droppedItem = new DroppedItemEntityImpl(skyBlockItem, player);
-                droppedItem.setInstance(player.getInstance(), dropPos);
-                droppedItem.addViewer(player);
+                    // Spawn the item
+                    DroppedItemEntityImpl droppedItem = new DroppedItemEntityImpl(dropItem, player);
+                    droppedItem.setInstance(player.getInstance(), dropPos);
+                    droppedItem.addViewer(player);
+                }
             }
-
         }
     }
 }