modify vanilla loot tables

Kaupenjoe · Kaupenjoe · commit 2b2af57ad407 · 2025-02-10T16:40:14.000+01:00
diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.21.1	2024-11-27T16:00:24.2426896	Loot Tables
+// 1.21.1	2025-02-10T16:33:41.540365	Loot Tables
 ea33c2a1e420da7916da2626364d946e161c2f6c data/tutorialmod/loot_table/blocks/bismuth_block.json
 63b39624969e53a57f98de95c0d38077aa71266c data/tutorialmod/loot_table/blocks/bismuth_button.json
 fd34a70d43389eb067a721582f8a89c3b58d29ab data/tutorialmod/loot_table/blocks/bismuth_deepslate_ore.json
@@ -19,6 +19,7 @@ af8e04bde28dac9e526252e8e8eb41e72357aa78 data/tutorialmod/loot_table/blocks/bism
 f6b893ccd90673b936db7684c63493fe47e3b7ef data/tutorialmod/loot_table/blocks/bloodwood_planks.json
 a09dda360357f8df5b81eb30c6623c64e484211d data/tutorialmod/loot_table/blocks/bloodwood_sapling.json
 bbf7c75cbc8b681248065c223f0849db279d57ef data/tutorialmod/loot_table/blocks/bloodwood_wood.json
+b1b90ee2a4a3ed439bf88673d91b911796a43ba5 data/tutorialmod/loot_table/blocks/chair.json
 8f5d307b68f65f6c0465ccc6f5ebdaf06af8f461 data/tutorialmod/loot_table/blocks/goji_berry_bush.json
 36b9bcd239fc7b8ab4aeafcbd04a4e2528293936 data/tutorialmod/loot_table/blocks/radish_crop.json
 1481019b709527c870fc227a77f886a0a7a60f43 data/tutorialmod/loot_table/blocks/stripped_bloodwood_log.json
diff --git a/src/generated/resources/.cache/95bb3a2eea1b1ca79b1089cc135e8d6882c6b2ad b/src/generated/resources/.cache/95bb3a2eea1b1ca79b1089cc135e8d6882c6b2ad
@@ -0,0 +1,6 @@
+// 1.21.1	2025-02-10T16:33:41.5388596	Global Loot Modifiers : tutorialmod
+42e3a6871db45b5632dfe1e4ede489bd312fcd37 data/neoforge/loot_modifiers/global_loot_modifiers.json
+4b9d2885653a320f8b77e961f00002fef0d3d5af data/tutorialmod/loot_modifiers/berry_from_creeper.json
+c06e4331aba273288afce360b396ac4f5ed6ffe7 data/tutorialmod/loot_modifiers/chisel_from_jungle_temple.json
+3fba1cb75fe11b12b8b75110fcb8d0e689c1b01d data/tutorialmod/loot_modifiers/radish_seeds_to_short_grass.json
+75be732f1c6a4e23725191c1b534625b46029a80 data/tutorialmod/loot_modifiers/radish_seeds_to_tall_grass.json
diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json
@@ -0,0 +1,9 @@
+{
+  "entries": [
+    "tutorialmod:berry_from_creeper",
+    "tutorialmod:radish_seeds_to_short_grass",
+    "tutorialmod:radish_seeds_to_tall_grass",
+    "tutorialmod:chisel_from_jungle_temple"
+  ],
+  "replace": false
+}
diff --git a/src/generated/resources/data/tutorialmod/loot_modifiers/berry_from_creeper.json b/src/generated/resources/data/tutorialmod/loot_modifiers/berry_from_creeper.json
@@ -0,0 +1,10 @@
+{
+  "type": "tutorialmod:add_item",
+  "conditions": [
+    {
+      "condition": "neoforge:loot_table_id",
+      "loot_table_id": "minecraft:entities/creeper"
+    }
+  ],
+  "item": "tutorialmod:goji_berries"
+}
diff --git a/src/generated/resources/data/tutorialmod/loot_modifiers/chisel_from_jungle_temple.json b/src/generated/resources/data/tutorialmod/loot_modifiers/chisel_from_jungle_temple.json
@@ -0,0 +1,10 @@
+{
+  "type": "tutorialmod:add_item",
+  "conditions": [
+    {
+      "condition": "neoforge:loot_table_id",
+      "loot_table_id": "minecraft:chests/jungle_temple"
+    }
+  ],
+  "item": "tutorialmod:chisel"
+}
diff --git a/src/generated/resources/data/tutorialmod/loot_modifiers/radish_seeds_to_short_grass.json b/src/generated/resources/data/tutorialmod/loot_modifiers/radish_seeds_to_short_grass.json
@@ -0,0 +1,14 @@
+{
+  "type": "tutorialmod:add_item",
+  "conditions": [
+    {
+      "block": "minecraft:short_grass",
+      "condition": "minecraft:block_state_property"
+    },
+    {
+      "chance": 0.25,
+      "condition": "minecraft:random_chance"
+    }
+  ],
+  "item": "tutorialmod:radish_seeds"
+}
diff --git a/src/generated/resources/data/tutorialmod/loot_modifiers/radish_seeds_to_tall_grass.json b/src/generated/resources/data/tutorialmod/loot_modifiers/radish_seeds_to_tall_grass.json
@@ -0,0 +1,14 @@
+{
+  "type": "tutorialmod:add_item",
+  "conditions": [
+    {
+      "block": "minecraft:tall_grass",
+      "condition": "minecraft:block_state_property"
+    },
+    {
+      "chance": 0.25,
+      "condition": "minecraft:random_chance"
+    }
+  ],
+  "item": "tutorialmod:radish_seeds"
+}
diff --git a/src/generated/resources/data/tutorialmod/loot_table/blocks/chair.json b/src/generated/resources/data/tutorialmod/loot_table/blocks/chair.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "tutorialmod:chair"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "tutorialmod:blocks/chair"
+}
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/TutorialMod.java b/src/main/java/net/kaupenjoe/tutorialmod/TutorialMod.java
@@ -10,6 +10,7 @@
 import net.kaupenjoe.tutorialmod.entity.client.TomahawkProjectileRenderer;
 import net.kaupenjoe.tutorialmod.item.ModCreativeModeTabs;
 import net.kaupenjoe.tutorialmod.item.ModItems;
+import net.kaupenjoe.tutorialmod.loot.ModLootModifiers;
 import net.kaupenjoe.tutorialmod.particle.BismuthParticles;
 import net.kaupenjoe.tutorialmod.particle.ModParticles;
 import net.kaupenjoe.tutorialmod.potion.ModPotions;
@@ -70,6 +71,8 @@ public TutorialMod(IEventBus modEventBus, ModContainer modContainer) {
         ModVillagers.register(modEventBus);
         ModParticles.register(modEventBus);
 
+        ModLootModifiers.register(modEventBus);
+
         // Register the item to a creative tab
         modEventBus.addListener(this::addCreative);
         // Register our mod's ModConfigSpec so that FML can create and load the config file for us
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/datagen/DataGenerators.java b/src/main/java/net/kaupenjoe/tutorialmod/datagen/DataGenerators.java
@@ -39,5 +39,6 @@ public static void gatherData(GatherDataEvent event) {
         generator.addProvider(event.includeClient(), new ModBlockStateProvider(packOutput, existingFileHelper));
 
         generator.addProvider(event.includeServer(), new ModDatapackProvider(packOutput, lookupProvider));
+        generator.addProvider(event.includeServer(), new ModGlobalLootModifierProvider(packOutput, lookupProvider));
     }
 }
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/datagen/ModBlockLootTableProvider.java b/src/main/java/net/kaupenjoe/tutorialmod/datagen/ModBlockLootTableProvider.java
@@ -96,6 +96,7 @@ protected void generate() {
         this.add(ModBlocks.BLOODWOOD_LEAVES.get(), block ->
                 createLeavesDrops(block, ModBlocks.BLOODWOOD_SAPLING.get(), NORMAL_LEAVES_SAPLING_CHANCES));
 
+        this.dropSelf(ModBlocks.CHAIR.get());
     }
 
     protected LootTable.Builder createMultipleOreDrops(Block pBlock, Item item, float minDrops, float maxDrops) {
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/datagen/ModGlobalLootModifierProvider.java b/src/main/java/net/kaupenjoe/tutorialmod/datagen/ModGlobalLootModifierProvider.java
@@ -0,0 +1,46 @@
+package net.kaupenjoe.tutorialmod.datagen;
+
+import net.kaupenjoe.tutorialmod.TutorialMod;
+import net.kaupenjoe.tutorialmod.item.ModItems;
+import net.kaupenjoe.tutorialmod.loot.AddItemModifier;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.data.PackOutput;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition;
+import net.neoforged.neoforge.common.data.GlobalLootModifierProvider;
+import net.neoforged.neoforge.common.loot.LootTableIdCondition;
+
+import java.util.concurrent.CompletableFuture;
+
+public class ModGlobalLootModifierProvider extends GlobalLootModifierProvider {
+    public ModGlobalLootModifierProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
+        super(output, registries, TutorialMod.MOD_ID);
+    }
+
+    @Override
+    protected void start() {
+        this.add("radish_seeds_to_short_grass",
+                new AddItemModifier(new LootItemCondition[] {
+                        LootItemBlockStatePropertyCondition.hasBlockStateProperties(Blocks.SHORT_GRASS).build(),
+                        LootItemRandomChanceCondition.randomChance(0.25f).build() }, ModItems.RADISH_SEEDS.get()));
+        this.add("radish_seeds_to_tall_grass",
+                new AddItemModifier(new LootItemCondition[] {
+                        LootItemBlockStatePropertyCondition.hasBlockStateProperties(Blocks.TALL_GRASS).build(),
+                        LootItemRandomChanceCondition.randomChance(0.25f).build() }, ModItems.RADISH_SEEDS.get()));
+
+        this.add("chisel_from_jungle_temple",
+                new AddItemModifier(new LootItemCondition[] {
+                        new LootTableIdCondition.Builder(ResourceLocation.withDefaultNamespace("chests/jungle_temple")).build()
+                }, ModItems.CHISEL.get()));
+
+        this.add("berry_from_creeper",
+                new AddItemModifier(new LootItemCondition[] {
+                        new LootTableIdCondition.Builder(ResourceLocation.withDefaultNamespace("entities/creeper")).build()
+                }, ModItems.GOJI_BERRIES.get()));
+
+
+    }
+}
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/loot/AddItemModifier.java b/src/main/java/net/kaupenjoe/tutorialmod/loot/AddItemModifier.java
@@ -0,0 +1,40 @@
+package net.kaupenjoe.tutorialmod.loot;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.storage.loot.LootContext;
+import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
+import net.neoforged.neoforge.common.loot.IGlobalLootModifier;
+import net.neoforged.neoforge.common.loot.LootModifier;
+
+public class AddItemModifier extends LootModifier {
+    public static final MapCodec<AddItemModifier> CODEC = RecordCodecBuilder.mapCodec(inst ->
+            LootModifier.codecStart(inst).and(
+                    BuiltInRegistries.ITEM.byNameCodec().fieldOf("item").forGetter(e -> e.item)).apply(inst, AddItemModifier::new));
+    private final Item item;
+
+    public AddItemModifier(LootItemCondition[] conditionsIn, Item item) {
+        super(conditionsIn);
+        this.item = item;
+    }
+
+    @Override
+    protected ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext lootContext) {
+        for (LootItemCondition condition : this.conditions) {
+            if(!condition.test(lootContext)) {
+                return generatedLoot;
+            }
+        }
+        generatedLoot.add(new ItemStack(this.item));
+        return generatedLoot;
+    }
+
+    @Override
+    public MapCodec<? extends IGlobalLootModifier> codec() {
+        return CODEC;
+    }
+}
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/loot/ModLootModifiers.java b/src/main/java/net/kaupenjoe/tutorialmod/loot/ModLootModifiers.java
@@ -0,0 +1,22 @@
+package net.kaupenjoe.tutorialmod.loot;
+
+import com.mojang.serialization.MapCodec;
+import net.kaupenjoe.tutorialmod.TutorialMod;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.neoforge.common.loot.IGlobalLootModifier;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+
+import java.util.function.Supplier;
+
+public class ModLootModifiers {
+    public static final DeferredRegister<MapCodec<? extends IGlobalLootModifier>> LOOT_MODIFIER_SERIALIZERS =
+            DeferredRegister.create(NeoForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, TutorialMod.MOD_ID);
+
+    public static final Supplier<MapCodec<? extends IGlobalLootModifier>> ADD_ITEM =
+            LOOT_MODIFIER_SERIALIZERS.register("add_item", () -> AddItemModifier.CODEC);
+
+    public static void register(IEventBus eventBus) {
+        LOOT_MODIFIER_SERIALIZERS.register(eventBus);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -39,5 +39,6 @@ public static void gatherData(GatherDataEvent event) {`
`39`	`39`	`generator.addProvider(event.includeClient(), new ModBlockStateProvider(packOutput, existingFileHelper));`
`40`	`40`
`41`	`41`	`generator.addProvider(event.includeServer(), new ModDatapackProvider(packOutput, lookupProvider));`
	`42`	`+ generator.addProvider(event.includeServer(), new ModGlobalLootModifierProvider(packOutput, lookupProvider));`
`42`	`43`	`}`
`43`	`44`	`}`