From 2057f5d6c62d1238605d024be7432a41591dcce5 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Wed, 29 Nov 2023 00:29:21 -0500 Subject: [PATCH] fixed small ore drops when the material has no gems or crushed but has dust --- .../datagen/providers/AntimatterBlockLootProvider.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterBlockLootProvider.java b/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterBlockLootProvider.java index d8de4973a..2ed813c63 100644 --- a/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterBlockLootProvider.java +++ b/common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterBlockLootProvider.java @@ -45,8 +45,7 @@ import java.util.Map; import java.util.function.Function; -import static muramasa.antimatter.data.AntimatterMaterialTypes.ORE; -import static muramasa.antimatter.data.AntimatterMaterialTypes.ORE_SMALL; +import static muramasa.antimatter.data.AntimatterMaterialTypes.*; public class AntimatterBlockLootProvider extends BlockLoot implements DataProvider, IAntimatterProvider { protected final String providerDomain, providerName; @@ -160,7 +159,12 @@ protected void addToFortune(BlockOre block) { public static Function addToFortuneWithoutCustomDrops(BlockOre block) { if (block.getOreType() == ORE_SMALL) { - if (!block.getMaterial().has(AntimatterMaterialTypes.GEM) && !(block.getMaterial().has(AntimatterMaterialTypes.CRUSHED))) return BlockLoot::createSingleItemTable; + if (!block.getMaterial().has(AntimatterMaterialTypes.GEM) && !(block.getMaterial().has(AntimatterMaterialTypes.CRUSHED))) { + if (block.getMaterial().has(DUST)){ + return b -> BlockLoot.createSingleItemTable(DUST.get(block.getMaterial())); + } + return BlockLoot::createSingleItemTable; + } Item item = block.getMaterial().has(AntimatterMaterialTypes.GEM) ? AntimatterMaterialTypes.GEM.get(block.getMaterial()) : null; int multiplier = MaterialTags.ORE_MULTI.getInt(block.getMaterial()); LootPool.Builder builder;