diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/DataGenerators.java b/src/main/java/xyz/sillyangel/nugget/datagen/DataGenerators.java new file mode 100644 index 0000000..b748c0a --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/DataGenerators.java @@ -0,0 +1,39 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.NuggetMod; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +import java.util.Collections; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +@Mod.EventBusSubscriber(modid = NuggetMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +public class DataGenerators { + @SubscribeEvent + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + PackOutput packOutput = generator.getPackOutput(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + CompletableFuture lookupProvider = event.getLookupProvider(); + + generator.addProvider(event.includeServer(), new LootTableProvider(packOutput, Collections.emptySet(), + List.of(new LootTableProvider.SubProviderEntry(ModBlockLootTableProvider::new, LootContextParamSets.BLOCK)), lookupProvider)); + generator.addProvider(event.includeServer(), new ModRecipeProvider(packOutput, lookupProvider)); + + BlockTagsProvider blockTagsProvider = new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper); + generator.addProvider(event.includeServer(), blockTagsProvider); + generator.addProvider(event.includeServer(), new ModItemTagProvider(packOutput, lookupProvider, blockTagsProvider.contentsGetter(), existingFileHelper)); + + generator.addProvider(event.includeClient(), new ModItemModelProvider(packOutput, existingFileHelper)); + generator.addProvider(event.includeClient(), new ModBlockStateProvider(packOutput, existingFileHelper)); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockLootTableProvider.java b/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockLootTableProvider.java new file mode 100644 index 0000000..1cda994 --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockLootTableProvider.java @@ -0,0 +1,55 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.block.ModBlocks; +import xyz.sillyangel.nugget.item.ModItems; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.item.enchantment.Enchantments; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.entries.LootItem; +import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; +import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount; +import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction; +import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; +import net.minecraftforge.registries.RegistryObject; + +import java.util.Set; + +public class ModBlockLootTableProvider extends BlockLootSubProvider { + protected ModBlockLootTableProvider(HolderLookup.Provider pRegistries) { + super(Set.of(), FeatureFlags.REGISTRY.allFlags(), pRegistries); + } + + @Override + protected void generate() { + dropSelf(ModBlocks.NUGGET_BLOCK.get()); + dropSelf(ModBlocks.RAW_NUGGET_BLOCK.get()); + + this.add(ModBlocks.NUGGET_ORE.get(), + block -> createOreDrop(ModBlocks.NUGGET_ORE.get(), ModItems.RAW_NUGGET.get())); + this.add(ModBlocks.NUGGET_DEEPSLATE_ORE.get(), + block -> createMultipleOreDrops(ModBlocks.NUGGET_DEEPSLATE_ORE.get(), ModItems.RAW_NUGGET.get(), 2, 6)); + } + + protected LootTable.Builder createMultipleOreDrops(Block pBlock, Item item, float minDrops, float maxDrops) { + HolderLookup.RegistryLookup registrylookup = this.registries.lookupOrThrow(Registries.ENCHANTMENT); + return this.createSilkTouchDispatchTable( + pBlock, this.applyExplosionDecay( + pBlock, LootItem.lootTableItem(item) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(minDrops, maxDrops))) + .apply(ApplyBonusCount.addOreBonusCount(registrylookup.getOrThrow(Enchantments.FORTUNE))) + ) + ); + } + + @Override + protected Iterable getKnownBlocks() { + return ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get)::iterator; + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockStateProvider.java b/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockStateProvider.java new file mode 100644 index 0000000..83e1659 --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockStateProvider.java @@ -0,0 +1,29 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.NuggetMod; +import xyz.sillyangel.nugget.block.ModBlocks; +import net.minecraft.data.PackOutput; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.client.model.generators.BlockStateProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.RegistryObject; + +public class ModBlockStateProvider extends BlockStateProvider { + public ModBlockStateProvider(PackOutput output, ExistingFileHelper exFileHelper) { + super(output, NuggetMod.MOD_ID, exFileHelper); + } + + @Override + protected void registerStatesAndModels() { + blockWithItem(ModBlocks.NUGGET_BLOCK); + blockWithItem(ModBlocks.RAW_NUGGET_BLOCK); + + blockWithItem(ModBlocks.NUGGET_ORE); + blockWithItem(ModBlocks.NUGGET_DEEPSLATE_ORE); + + } + + private void blockWithItem(RegistryObject blockRegistryObject) { + simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get())); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockTagProvider.java b/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockTagProvider.java new file mode 100644 index 0000000..5ade37e --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/ModBlockTagProvider.java @@ -0,0 +1,33 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.NuggetMod; +import xyz.sillyangel.nugget.block.ModBlocks; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.tags.BlockTags; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class ModBlockTagProvider extends BlockTagsProvider { + public ModBlockTagProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, NuggetMod.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + tag(BlockTags.MINEABLE_WITH_PICKAXE) + .add(ModBlocks.NUGGET_BLOCK.get()) + .add(ModBlocks.RAW_NUGGET_BLOCK.get()) + .add(ModBlocks.NUGGET_ORE.get()) + .add(ModBlocks.NUGGET_DEEPSLATE_ORE.get()); + + tag(BlockTags.NEEDS_IRON_TOOL) + .add(ModBlocks.NUGGET_DEEPSLATE_ORE.get()); + + tag(BlockTags.NEEDS_DIAMOND_TOOL) + .add(ModBlocks.RAW_NUGGET_BLOCK.get()); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/ModItemModelProvider.java b/src/main/java/xyz/sillyangel/nugget/datagen/ModItemModelProvider.java new file mode 100644 index 0000000..1aac248 --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/ModItemModelProvider.java @@ -0,0 +1,19 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.NuggetMod; +import xyz.sillyangel.nugget.item.ModItems; +import net.minecraft.data.PackOutput; +import net.minecraftforge.client.model.generators.ItemModelProvider; +import net.minecraftforge.common.data.ExistingFileHelper; + +public class ModItemModelProvider extends ItemModelProvider { + public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { + super(output, NuggetMod.MOD_ID, existingFileHelper); + } + + @Override + protected void registerModels() { + basicItem(ModItems.NUGGET.get()); + basicItem(ModItems.RAW_NUGGET.get()); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/ModItemTagProvider.java b/src/main/java/xyz/sillyangel/nugget/datagen/ModItemTagProvider.java new file mode 100644 index 0000000..bedad9b --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/ModItemTagProvider.java @@ -0,0 +1,31 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.NuggetMod; +import xyz.sillyangel.nugget.item.ModItems; +import xyz.sillyangel.nugget.util.ModTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public class ModItemTagProvider extends ItemTagsProvider { + public ModItemTagProvider(PackOutput packOutput, CompletableFuture completableFuture, + CompletableFuture> lookupCompletableFuture, @Nullable ExistingFileHelper existingFileHelper) { + super(packOutput, completableFuture, lookupCompletableFuture, NuggetMod.MOD_ID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + tag(ModTags.Items.TRANSFORMABLE_ITEMS) + .add(ModItems.NUGGET.get()) + .add(ModItems.RAW_NUGGET.get()) + .add(Items.COAL) + .add(Items.STICK) + .add(Items.COMPASS); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/datagen/ModRecipeProvider.java b/src/main/java/xyz/sillyangel/nugget/datagen/ModRecipeProvider.java new file mode 100644 index 0000000..5fbe007 --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/datagen/ModRecipeProvider.java @@ -0,0 +1,60 @@ +package xyz.sillyangel.nugget.datagen; + +import xyz.sillyangel.nugget.NuggetMod; +import xyz.sillyangel.nugget.block.ModBlocks; +import xyz.sillyangel.nugget.item.ModItems; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.*; +import net.minecraft.world.item.crafting.*; +import net.minecraft.world.level.ItemLike; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; + +import java.util.List; +import java.util.concurrent.CompletableFuture; + +public class ModRecipeProvider extends RecipeProvider implements IConditionBuilder { + public ModRecipeProvider(PackOutput pOutput, CompletableFuture pRegistries) { + super(pOutput, pRegistries); + } + + @Override + protected void buildRecipes(RecipeOutput pRecipeOutput) { + List NUGGET_SMELTABLES = List.of(ModItems.RAW_NUGGET.get(), + ModBlocks.NUGGET_ORE.get(), ModBlocks.NUGGET_DEEPSLATE_ORE.get()); + + ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.NUGGET_BLOCK.get()) + .pattern("AAA") + .pattern("AAA") + .pattern("AAA") + .define('A', ModItems.NUGGET.get()) + .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(pRecipeOutput); + + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.NUGGET.get(), 9) + .requires(ModBlocks.NUGGET_BLOCK.get()) + .unlockedBy(getHasName(ModBlocks.NUGGET_BLOCK.get()), has(ModBlocks.NUGGET_BLOCK.get())).save(pRecipeOutput); + + oreSmelting(pRecipeOutput, NUGGET_SMELTABLES, RecipeCategory.MISC, ModItems.NUGGET.get(), 0.25f, 200, "nugget"); + oreBlasting(pRecipeOutput, NUGGET_SMELTABLES, RecipeCategory.MISC, ModItems.NUGGET.get(), 0.25f, 100, "nugget"); + } + + protected static void oreSmelting(RecipeOutput recipeOutput, List pIngredients, RecipeCategory pCategory, ItemLike pResult, + float pExperience, int pCookingTIme, String pGroup) { + oreCooking(recipeOutput, RecipeSerializer.SMELTING_RECIPE, SmeltingRecipe::new, pIngredients, pCategory, pResult, + pExperience, pCookingTIme, pGroup, "_from_smelting"); + } + + protected static void oreBlasting(RecipeOutput recipeOutput, List pIngredients, RecipeCategory pCategory, ItemLike pResult, + float pExperience, int pCookingTime, String pGroup) { + oreCooking(recipeOutput, RecipeSerializer.BLASTING_RECIPE, BlastingRecipe::new, pIngredients, pCategory, pResult, + pExperience, pCookingTime, pGroup, "_from_blasting"); + } + + protected static void oreCooking(RecipeOutput recipeOutput, RecipeSerializer pCookingSerializer, AbstractCookingRecipe.Factory factory, + List pIngredients, RecipeCategory pCategory, ItemLike pResult, float pExperience, int pCookingTime, String pGroup, String pRecipeName) { + for(ItemLike itemlike : pIngredients) { + SimpleCookingRecipeBuilder.generic(Ingredient.of(itemlike), pCategory, pResult, pExperience, pCookingTime, pCookingSerializer, factory).group(pGroup).unlockedBy(getHasName(itemlike), has(itemlike)) + .save(recipeOutput, NuggetMod.MOD_ID + ":" + getItemName(pResult) + pRecipeName + "_" + getItemName(itemlike)); + } + } +} \ No newline at end of file diff --git a/src/main/java/xyz/sillyangel/nugget/util/ModTags.java b/src/main/java/xyz/sillyangel/nugget/util/ModTags.java new file mode 100644 index 0000000..0be4fda --- /dev/null +++ b/src/main/java/xyz/sillyangel/nugget/util/ModTags.java @@ -0,0 +1,26 @@ +package xyz.sillyangel.nugget.util; + +import xyz.sillyangel.nugget.NuggetMod; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; + +public class ModTags { + public static class Blocks { + + private static TagKey createTag(String name) { + return BlockTags.create(ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, name)); + } + } + + public static class Items { + public static final TagKey TRANSFORMABLE_ITEMS = createTag("transformable_items"); + + private static TagKey createTag(String name) { + return ItemTags.create(ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, name)); + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/blockstates/nugget_block.json b/src/main/resources/assets/nuggetmod/blockstates/nugget_block.json deleted file mode 100644 index 1875e42..0000000 --- a/src/main/resources/assets/nuggetmod/blockstates/nugget_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "nuggetmod:block/nugget_block" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json b/src/main/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json deleted file mode 100644 index e4d9a13..0000000 --- a/src/main/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "nuggetmod:block/nugget_deepslate_ore" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/blockstates/nugget_ore.json b/src/main/resources/assets/nuggetmod/blockstates/nugget_ore.json deleted file mode 100644 index af332b5..0000000 --- a/src/main/resources/assets/nuggetmod/blockstates/nugget_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "nuggetmod:block/nugget_ore" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/blockstates/raw_nugget_block.json b/src/main/resources/assets/nuggetmod/blockstates/raw_nugget_block.json deleted file mode 100644 index 06e39f2..0000000 --- a/src/main/resources/assets/nuggetmod/blockstates/raw_nugget_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "nuggetmod:block/raw_nugget_block" } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/block/nugget_block.json b/src/main/resources/assets/nuggetmod/models/block/nugget_block.json deleted file mode 100644 index 0b7907d..0000000 --- a/src/main/resources/assets/nuggetmod/models/block/nugget_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "nuggetmod:block/nugget_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json b/src/main/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json deleted file mode 100644 index 4b5dc97..0000000 --- a/src/main/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "nuggetmod:block/nugget_deepslate_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/block/nugget_ore.json b/src/main/resources/assets/nuggetmod/models/block/nugget_ore.json deleted file mode 100644 index 10d20f8..0000000 --- a/src/main/resources/assets/nuggetmod/models/block/nugget_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "nuggetmod:block/nugget_ore" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/block/raw_nugget_block.json b/src/main/resources/assets/nuggetmod/models/block/raw_nugget_block.json deleted file mode 100644 index 3177a07..0000000 --- a/src/main/resources/assets/nuggetmod/models/block/raw_nugget_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "nuggetmod:block/raw_nugget_block" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget.json b/src/main/resources/assets/nuggetmod/models/item/nugget.json deleted file mode 100644 index 6138aad..0000000 --- a/src/main/resources/assets/nuggetmod/models/item/nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "nuggetmod:item/nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_block.json b/src/main/resources/assets/nuggetmod/models/item/nugget_block.json deleted file mode 100644 index 919ff0a..0000000 --- a/src/main/resources/assets/nuggetmod/models/item/nugget_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "nuggetmod:block/nugget_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_deepslate_ore.json b/src/main/resources/assets/nuggetmod/models/item/nugget_deepslate_ore.json deleted file mode 100644 index c7d55b6..0000000 --- a/src/main/resources/assets/nuggetmod/models/item/nugget_deepslate_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "nuggetmod:block/nugget_deepslate_ore" -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_ore.json b/src/main/resources/assets/nuggetmod/models/item/nugget_ore.json deleted file mode 100644 index 2d118a6..0000000 --- a/src/main/resources/assets/nuggetmod/models/item/nugget_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "nuggetmod:block/nugget_ore" -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/raw_nugget.json b/src/main/resources/assets/nuggetmod/models/item/raw_nugget.json deleted file mode 100644 index a902b58..0000000 --- a/src/main/resources/assets/nuggetmod/models/item/raw_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "nuggetmod:item/raw_nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/raw_nugget_block.json b/src/main/resources/assets/nuggetmod/models/item/raw_nugget_block.json deleted file mode 100644 index 248ff97..0000000 --- a/src/main/resources/assets/nuggetmod/models/item/raw_nugget_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "nuggetmod:block/raw_nugget_block" -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json deleted file mode 100644 index aac995c..0000000 --- a/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_block", - "nuggetmod:raw_nugget_block", - "nuggetmod:nugget_ore", - "nuggetmod:nugget_deepslate_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json b/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json deleted file mode 100644 index ccfdd17..0000000 --- a/src/main/resources/data/minecraft/tags/block/needs_diamond_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_deepslate_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json deleted file mode 100644 index 33412d2..0000000 --- a/src/main/resources/data/minecraft/tags/block/needs_iron_tool.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_block", - "nuggetmod:raw_nugget_block", - "nuggetmod:nugget_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_block.json b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_block.json deleted file mode 100644 index b00103d..0000000 --- a/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_block.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "nuggetmod:nugget_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "nuggetmod:blocks/nugget_block" - } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json deleted file mode 100644 index 21fb98a..0000000 --- a/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "name": "nuggetmod:nugget_deepslate_ore" - }, - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "count": { - "type": "minecraft:uniform", - "max": 5.0, - "min": 2.0 - }, - "function": "minecraft:set_count" - }, - { - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops", - "function": "minecraft:apply_bonus" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "nuggetmod:raw_nugget" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "nuggetmod:blocks/nugget_deepslate_ore" - } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json deleted file mode 100644 index 53172e2..0000000 --- a/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "name": "nuggetmod:nugget_ore" - }, - { - "type": "minecraft:item", - "functions": [ - { - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops", - "function": "minecraft:apply_bonus" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "nuggetmod:raw_nugget" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "nuggetmod:blocks/nugget_ore" - } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json b/src/main/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json deleted file mode 100644 index 1d10b32..0000000 --- a/src/main/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "nuggetmod:raw_nugget_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "nuggetmod:blocks/raw_nugget_block" - } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/nugget.json b/src/main/resources/data/nuggetmod/recipe/nugget.json deleted file mode 100644 index 8930a26..0000000 --- a/src/main/resources/data/nuggetmod/recipe/nugget.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "nuggetmod:nugget_block" - } - ], - "result": { - "count": 9, - "id": "nuggetmod:nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/nugget_block.json b/src/main/resources/data/nuggetmod/recipe/nugget_block.json deleted file mode 100644 index afbc976..0000000 --- a/src/main/resources/data/nuggetmod/recipe/nugget_block.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "A": { - "item": "nuggetmod:nugget" - } - }, - "pattern": [ - "AAA", - "AAA", - "AAA" - ], - "result": { - "count": 1, - "id": "nuggetmod:nugget_block" - } -} \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json deleted file mode 100644 index f4fa045..0000000 --- a/src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:blasting", - "category": "misc", - "cookingtime": 100, - "experience": 0.50, - "ingredient": { - "item": "nuggetmod:raw_nugget" - }, - "result": { - "id": "nuggetmod:nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json deleted file mode 100644 index 4aec86b..0000000 --- a/src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "misc", - "cookingtime": 200, - "experience": 0.35, - "ingredient": { - "item": "nuggetmod:raw_nugget" - }, - "result": { - "id": "nuggetmod:nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/raw_nugget.json b/src/main/resources/data/nuggetmod/recipe/raw_nugget.json deleted file mode 100644 index b0b33c7..0000000 --- a/src/main/resources/data/nuggetmod/recipe/raw_nugget.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "nuggetmod:raw_nugget_block" - } - ], - "result": { - "count": 9, - "id": "nuggetmod:raw_nugget" - } - } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/raw_nugget_block.json b/src/main/resources/data/nuggetmod/recipe/raw_nugget_block.json deleted file mode 100644 index 93a1bde..0000000 --- a/src/main/resources/data/nuggetmod/recipe/raw_nugget_block.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "A": { - "item": "nuggetmod:raw_nugget" - } - }, - "pattern": [ - "AAA", - "AAA", - "AAA" - ], - "result": { - "count": 1, - "id": "nuggetmod:raw_nugget_block" - } - } \ No newline at end of file