diff --git a/gradle.properties b/gradle.properties index 954bd71..72d8ac8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Sets default memory used for Gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. -org.gradle.jvmargs=-Xmx5G +org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # In the case that Gradle needs to fork to recompile, this will set the memory for that process. @@ -55,11 +55,11 @@ mod_name=Nugget Mod # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=MIT # The mod version. See https://semver.org/ -mod_version=1.2.2 +mod_version=1.3.1 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html -mod_group_id=dev.sillyangel.nugget +mod_group_id=dev.sillyangel.nuggetmod # The authors of the mod. This is a simple text string that is used for display purposes in the mod list. mod_authors=sillyangel # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list. diff --git a/run-data/logs/debug.log b/run-data/logs/debug.log index ca1bab1..b0c3d5f 100644 --- a/run-data/logs/debug.log +++ b/run-data/logs/debug.log @@ -307,8 +307,8 @@ [05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLModContainer/LOADING]: Creating FMLModContainer instance for net.minecraftforge.common.ForgeMod [05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLModContainer/LOADING]: Loaded modclass net.minecraftforge.forge/net.minecraftforge.common.ForgeMod with TransformingClassLoader[TRANSFORMER]@155829656 [05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLJavaModLanguageProvider/LOADING]: Loading FMLModContainer from classloader TransformingClassLoader[TRANSFORMER]@155829656 - got SecureModuleClassLoader[LAYER PLUGIN]@92941132 -[05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLModContainer/LOADING]: Creating FMLModContainer instance for dev.sillyangel.nugget.NuggetMod -[05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLModContainer/LOADING]: Loaded modclass nuggetmod/dev.sillyangel.nugget.NuggetMod with TransformingClassLoader[TRANSFORMER]@155829656 +[05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLModContainer/LOADING]: Creating FMLModContainer instance for dev.sillyangel.nuggetmod.NuggetMod +[05Jan2025 22:08:43.805] [main/DEBUG] [net.minecraftforge.fml.javafmlmod.FMLModContainer/LOADING]: Loaded modclass nuggetmod/dev.sillyangel.nuggetmod.NuggetMod with TransformingClassLoader[TRANSFORMER]@155829656 [05Jan2025 22:08:43.886] [modloading-worker-0/DEBUG] [net.minecraftforge.versions.forge.ForgeVersion/CORE]: Forge Version package package net.minecraftforge.versions.forge, Forge, version 0.0 from TransformingClassLoader[TRANSFORMER]@155829656 [05Jan2025 22:08:43.886] [modloading-worker-0/DEBUG] [net.minecraftforge.versions.forge.ForgeVersion/CORE]: Found Forge version 53.0.25 [05Jan2025 22:08:43.886] [modloading-worker-0/DEBUG] [net.minecraftforge.versions.forge.ForgeVersion/CORE]: Found Forge spec 0.0 @@ -320,10 +320,10 @@ [05Jan2025 22:08:43.886] [modloading-worker-0/INFO] [net.minecraftforge.common.MinecraftForge/FORGE]: MinecraftForge v53.0.25 Initialized [05Jan2025 22:08:43.965] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.config.ConfigTracker/CONFIG]: Config file nuggetmod-common.toml for nuggetmod tracking [05Jan2025 22:08:43.998] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Attempting to inject @EventBusSubscriber classes into the eventbus for nuggetmod -[05Jan2025 22:08:43.998] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Auto-subscribing dev.sillyangel.nugget.Config to MOD +[05Jan2025 22:08:43.998] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Auto-subscribing dev.sillyangel.nuggetmod.Config to MOD [05Jan2025 22:08:44.013] [modloading-worker-0/INFO] [net.minecraftforge.common.ForgeMod/FORGEMOD]: Opening jdk.naming.dns/com.sun.jndi.dns to java.naming -[05Jan2025 22:08:44.029] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Auto-subscribing datagen.dev.sillyangel.nugget.DataGenerators to MOD -[05Jan2025 22:08:44.029] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Auto-subscribing dev.sillyangel.nugget.NuggetMod$ClientModEvents to MOD +[05Jan2025 22:08:44.029] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Auto-subscribing datagen.dev.sillyangel.nuggetmod.DataGenerators to MOD +[05Jan2025 22:08:44.029] [modloading-worker-0/DEBUG] [net.minecraftforge.fml.javafmlmod.AutomaticEventSubscriber/LOADING]: Auto-subscribing dev.sillyangel.nuggetmod.NuggetMod$ClientModEvents to MOD [05Jan2025 22:08:44.061] [modloading-worker-0/DEBUG] [io.netty.util.internal.PlatformDependent0/]: -Dio.netty.noUnsafe: false [05Jan2025 22:08:44.061] [modloading-worker-0/DEBUG] [io.netty.util.internal.PlatformDependent0/]: Java version: 21 [05Jan2025 22:08:44.061] [modloading-worker-0/DEBUG] [io.netty.util.internal.PlatformDependent0/]: sun.misc.Unsafe.theUnsafe: available diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_block.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_block.json deleted file mode 100644 index 696956e..0000000 --- a/src/generated/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/generated/resources/assets/nuggetmod/models/item/nugget_boots.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_boots.json deleted file mode 100644 index cf895db..0000000 --- a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "nuggetmod:item/nugget_boots_quartz_trim", - "predicate": { - "minecraft:trim_type": 0.1 - } - }, - { - "model": "nuggetmod:item/nugget_boots_iron_trim", - "predicate": { - "minecraft:trim_type": 0.2 - } - }, - { - "model": "nuggetmod:item/nugget_boots_netherite_trim", - "predicate": { - "minecraft:trim_type": 0.3 - } - }, - { - "model": "nuggetmod:item/nugget_boots_redstone_trim", - "predicate": { - "minecraft:trim_type": 0.4 - } - }, - { - "model": "nuggetmod:item/nugget_boots_copper_trim", - "predicate": { - "minecraft:trim_type": 0.5 - } - }, - { - "model": "nuggetmod:item/nugget_boots_gold_trim", - "predicate": { - "minecraft:trim_type": 0.6 - } - }, - { - "model": "nuggetmod:item/nugget_boots_emerald_trim", - "predicate": { - "minecraft:trim_type": 0.7 - } - }, - { - "model": "nuggetmod:item/nugget_boots_diamond_trim", - "predicate": { - "minecraft:trim_type": 0.8 - } - }, - { - "model": "nuggetmod:item/nugget_boots_lapis_trim", - "predicate": { - "minecraft:trim_type": 0.9 - } - }, - { - "model": "nuggetmod:item/nugget_boots_amethyst_trim", - "predicate": { - "minecraft:trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "nuggetmod:item/nugget_boots" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate.json deleted file mode 100644 index 63d36de..0000000 --- a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "nuggetmod:item/nugget_chestplate_quartz_trim", - "predicate": { - "minecraft:trim_type": 0.1 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_iron_trim", - "predicate": { - "minecraft:trim_type": 0.2 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_netherite_trim", - "predicate": { - "minecraft:trim_type": 0.3 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_redstone_trim", - "predicate": { - "minecraft:trim_type": 0.4 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_copper_trim", - "predicate": { - "minecraft:trim_type": 0.5 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_gold_trim", - "predicate": { - "minecraft:trim_type": 0.6 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_emerald_trim", - "predicate": { - "minecraft:trim_type": 0.7 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_diamond_trim", - "predicate": { - "minecraft:trim_type": 0.8 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_lapis_trim", - "predicate": { - "minecraft:trim_type": 0.9 - } - }, - { - "model": "nuggetmod:item/nugget_chestplate_amethyst_trim", - "predicate": { - "minecraft:trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "nuggetmod:item/nugget_chestplate" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_deepslate_ore.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_deepslate_ore.json deleted file mode 100644 index f43e28a..0000000 --- a/src/generated/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/generated/resources/assets/nuggetmod/models/item/nugget_helmet.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet.json deleted file mode 100644 index 35afe01..0000000 --- a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "nuggetmod:item/nugget_helmet_quartz_trim", - "predicate": { - "minecraft:trim_type": 0.1 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_iron_trim", - "predicate": { - "minecraft:trim_type": 0.2 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_netherite_trim", - "predicate": { - "minecraft:trim_type": 0.3 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_redstone_trim", - "predicate": { - "minecraft:trim_type": 0.4 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_copper_trim", - "predicate": { - "minecraft:trim_type": 0.5 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_gold_trim", - "predicate": { - "minecraft:trim_type": 0.6 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_emerald_trim", - "predicate": { - "minecraft:trim_type": 0.7 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_diamond_trim", - "predicate": { - "minecraft:trim_type": 0.8 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_lapis_trim", - "predicate": { - "minecraft:trim_type": 0.9 - } - }, - { - "model": "nuggetmod:item/nugget_helmet_amethyst_trim", - "predicate": { - "minecraft:trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "nuggetmod:item/nugget_helmet" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings.json deleted file mode 100644 index f729cdb..0000000 --- a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "overrides": [ - { - "model": "nuggetmod:item/nugget_leggings_quartz_trim", - "predicate": { - "minecraft:trim_type": 0.1 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_iron_trim", - "predicate": { - "minecraft:trim_type": 0.2 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_netherite_trim", - "predicate": { - "minecraft:trim_type": 0.3 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_redstone_trim", - "predicate": { - "minecraft:trim_type": 0.4 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_copper_trim", - "predicate": { - "minecraft:trim_type": 0.5 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_gold_trim", - "predicate": { - "minecraft:trim_type": 0.6 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_emerald_trim", - "predicate": { - "minecraft:trim_type": 0.7 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_diamond_trim", - "predicate": { - "minecraft:trim_type": 0.8 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_lapis_trim", - "predicate": { - "minecraft:trim_type": 0.9 - } - }, - { - "model": "nuggetmod:item/nugget_leggings_amethyst_trim", - "predicate": { - "minecraft:trim_type": 1.0 - } - } - ], - "textures": { - "layer0": "nuggetmod:item/nugget_leggings" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_ore.json b/src/generated/resources/assets/nuggetmod/models/item/nugget_ore.json deleted file mode 100644 index 446dca9..0000000 --- a/src/generated/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/generated/resources/assets/nuggetmod/models/item/raw_nugget_block.json b/src/generated/resources/assets/nuggetmod/models/item/raw_nugget_block.json deleted file mode 100644 index 4868031..0000000 --- a/src/generated/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/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json deleted file mode 100644 index 657144e..0000000 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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/generated/resources/data/minecraft/tags/block/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json deleted file mode 100644 index d4b9bba..0000000 --- a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "nuggetmod:nugget_deepslate_ore", - "nuggetmod:raw_nugget_block" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/trim_templates.json b/src/generated/resources/data/minecraft/tags/item/trim_templates.json deleted file mode 100644 index 58d1013..0000000 --- a/src/generated/resources/data/minecraft/tags/item/trim_templates.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "nuggetmod:nugget_armor_trim_smithing_template" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/trimmable_armor.json b/src/generated/resources/data/minecraft/tags/item/trimmable_armor.json deleted file mode 100644 index 24c5f21..0000000 --- a/src/generated/resources/data/minecraft/tags/item/trimmable_armor.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "values": [ - "nuggetmod:nugget_helmet", - "nuggetmod:nugget_chestplate", - "nuggetmod:nugget_leggings", - "nuggetmod:nugget_boots" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/forge/biome_modifier/add_nugget_ore.json b/src/generated/resources/data/nuggetmod/forge/biome_modifier/add_nugget_ore.json deleted file mode 100644 index f8187aa..0000000 --- a/src/generated/resources/data/nuggetmod/forge/biome_modifier/add_nugget_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "forge:add_features", - "biomes": "#minecraft:is_overworld", - "features": "nuggetmod:nugget_ore_placed", - "step": "underground_ores" -} \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/tags/block/needs_nugget_tool.json b/src/generated/resources/data/nuggetmod/tags/block/needs_nugget_tool.json deleted file mode 100644 index 35fe395..0000000 --- a/src/generated/resources/data/nuggetmod/tags/block/needs_nugget_tool.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "nuggetmod:raw_nugget_block", - "#minecraft:needs_diamond_tool" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/tags/item/transformable_items.json b/src/generated/resources/data/nuggetmod/tags/item/transformable_items.json deleted file mode 100644 index 263d96c..0000000 --- a/src/generated/resources/data/nuggetmod/tags/item/transformable_items.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "nuggetmod:nugget", - "nuggetmod:raw_nugget", - "minecraft:coal", - "minecraft:stick", - "minecraft:compass" - ] -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/datagen/DataGenerators.java b/src/main/java/dev/sillyangel/nugget/datagen/DataGenerators.java deleted file mode 100644 index 56a9407..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/DataGenerators.java +++ /dev/null @@ -1,41 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.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.listener.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.Runner(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)); - - generator.addProvider(event.includeServer(), new ModDatapackEntries(packOutput, lookupProvider)); - } -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/datagen/ModBlockLootTableProvider.java b/src/main/java/dev/sillyangel/nugget/datagen/ModBlockLootTableProvider.java deleted file mode 100644 index 88f151a..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModBlockLootTableProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.sillyangel.nugget.block.ModBlocks; -import dev.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.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.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/dev/sillyangel/nugget/datagen/ModBlockStateProvider.java b/src/main/java/dev/sillyangel/nugget/datagen/ModBlockStateProvider.java deleted file mode 100644 index 35a68ef..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModBlockStateProvider.java +++ /dev/null @@ -1,29 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.sillyangel.nugget.NuggetMod; -import dev.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/dev/sillyangel/nugget/datagen/ModBlockTagProvider.java b/src/main/java/dev/sillyangel/nugget/datagen/ModBlockTagProvider.java deleted file mode 100644 index ef35684..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModBlockTagProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.sillyangel.nugget.NuggetMod; -import dev.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 dev.sillyangel.nugget.util.ModTags; - -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_STONE_TOOL) - .add(ModBlocks.NUGGET_DEEPSLATE_ORE.get()) - .add(ModBlocks.NUGGET_BLOCK.get()) - .add(ModBlocks.RAW_NUGGET_BLOCK.get()); - - tag(ModTags.Blocks.NEEDS_NUGGET_TOOL) - .add(ModBlocks.RAW_NUGGET_BLOCK.get()) - .addTag(BlockTags.NEEDS_DIAMOND_TOOL); - - tag(ModTags.Blocks.INCORRECT_FOR_NUGGET_TOOL) - .addTag(BlockTags.INCORRECT_FOR_DIAMOND_TOOL) - .remove(ModTags.Blocks.NEEDS_NUGGET_TOOL); - } -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/datagen/ModDatapackEntries.java b/src/main/java/dev/sillyangel/nugget/datagen/ModDatapackEntries.java deleted file mode 100644 index 970dddf..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModDatapackEntries.java +++ /dev/null @@ -1,31 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.trim.ModTrimMaterials; -import dev.sillyangel.nugget.trim.ModTrimPatterns; -import dev.sillyangel.nugget.worldgen.ModBiomeModifiers; -import dev.sillyangel.nugget.worldgen.ModConfiguredFeatures; -import dev.sillyangel.nugget.worldgen.ModPlacedFeatures; -import net.minecraft.core.HolderLookup; -import net.minecraft.core.RegistrySetBuilder; -import net.minecraft.core.registries.Registries; -import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.DatapackBuiltinEntriesProvider; -import net.minecraftforge.registries.ForgeRegistries; - -import java.util.Set; -import java.util.concurrent.CompletableFuture; - -public class ModDatapackEntries extends DatapackBuiltinEntriesProvider { - public static final RegistrySetBuilder BUILDER = new RegistrySetBuilder() - .add(Registries.TRIM_MATERIAL, ModTrimMaterials::bootstrap) - .add(Registries.TRIM_PATTERN, ModTrimPatterns::bootstrap) - - .add(Registries.CONFIGURED_FEATURE, ModConfiguredFeatures::bootstrap) - .add(Registries.PLACED_FEATURE, ModPlacedFeatures::bootstrap) - .add(ForgeRegistries.Keys.BIOME_MODIFIERS, ModBiomeModifiers::bootstrap); - - public ModDatapackEntries(PackOutput output, CompletableFuture registries) { - super(output, registries, BUILDER, Set.of(NuggetMod.MOD_ID)); - } -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/datagen/ModItemModelProvider.java b/src/main/java/dev/sillyangel/nugget/datagen/ModItemModelProvider.java deleted file mode 100644 index b437cb1..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModItemModelProvider.java +++ /dev/null @@ -1,134 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.item.ModItems; -import net.minecraft.data.PackOutput; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.Identifier; -import net.minecraft.server.packs.PackType; -import net.minecraft.world.item.ArmorItem; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.equipment.trim.TrimMaterial; -import net.minecraft.world.item.equipment.trim.TrimMaterials; -import net.minecraft.world.level.block.Block; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.registries.ForgeRegistries; -import net.minecraftforge.registries.RegistryObject; - -import java.util.LinkedHashMap; - -public class ModItemModelProvider extends ItemModelProvider { - private static LinkedHashMap, Float> trimMaterials = new LinkedHashMap<>(); - static { - trimMaterials.put(TrimMaterials.QUARTZ, 0.1F); - trimMaterials.put(TrimMaterials.IRON, 0.2F); - trimMaterials.put(TrimMaterials.NETHERITE, 0.3F); - trimMaterials.put(TrimMaterials.REDSTONE, 0.4F); - trimMaterials.put(TrimMaterials.COPPER, 0.5F); - trimMaterials.put(TrimMaterials.GOLD, 0.6F); - trimMaterials.put(TrimMaterials.EMERALD, 0.7F); - trimMaterials.put(TrimMaterials.DIAMOND, 0.8F); - trimMaterials.put(TrimMaterials.LAPIS, 0.9F); - trimMaterials.put(TrimMaterials.AMETHYST, 1.0F); - } - - public ModItemModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { - super(output, NuggetMod.MOD_ID, existingFileHelper); - } - - @Override - protected void registerModels() { - basicItem(ModItems.NUGGET_HORSE_ARMOR.get()); - basicItem(ModItems.NUGGET_SMITHING_TEMPLATE.get()); - basicItem(ModItems.NUGGET.get()); - basicItem(ModItems.RAW_NUGGET.get()); - basicItem(ModItems.NUGGET_MUSIC_DISC.get()); - - handheldItem(ModItems.NUGGET_SWORD); - handheldItem(ModItems.NUGGET_PICKAXE); - handheldItem(ModItems.NUGGET_SHOVEL); - handheldItem(ModItems.NUGGET_AXE); - handheldItem(ModItems.NUGGET_HOE); - - trimmedArmorItem(ModItems.NUGGET_HELMET); - trimmedArmorItem(ModItems.NUGGET_CHESTPLATE); - trimmedArmorItem(ModItems.NUGGET_LEGGINGS); - trimmedArmorItem(ModItems.NUGGET_BOOTS); - } - private void trimmedArmorItem(RegistryObject itemRegistryObject) { - final String MOD_ID = NuggetMod.MOD_ID; // Change this to your mod id - if (itemRegistryObject.get() instanceof ArmorItem armorItem) { - trimMaterials.forEach((trimMaterial, value) -> { - float trimValue = value; - - String armorType = ""; - if(armorItem.toString().contains("helmet")) { - armorType = "helmet"; - } else if(armorItem.toString().contains("chestplate")) { - armorType = "chestplate"; - } else if(armorItem.toString().contains("leggings")) { - armorType = "leggings"; - } else if(armorItem.toString().contains("boots")) { - armorType = "boots"; - } - - - String armorItemPath = armorItem.toString(); - String trimPath = "trims/items/" + armorType + "_trim_" + trimMaterial.location().getPath(); - String currentTrimName = armorItemPath + "_" + trimMaterial.location().getPath() + "_trim"; - Identifier armorItemResLoc = Identifier.parse(armorItemPath); - Identifier trimResLoc = Identifier.parse(trimPath); // minecraft namespace - Identifier trimNameResLoc = Identifier.parse(currentTrimName); - // This is used for making the ExistingFileHelper acknowledge that this texture exist, so this will - // avoid an IllegalArgumentException - existingFileHelper.trackGenerated(trimResLoc, PackType.CLIENT_RESOURCES, ".png", "textures"); - // Trimmed armorItem files - getBuilder(currentTrimName) - .parent(new ModelFile.UncheckedModelFile("item/generated")) - .texture("layer0", armorItemResLoc.getNamespace() + ":item/" + armorItemResLoc.getPath()) - .texture("layer1", trimResLoc); - // Non-trimmed armorItem file (normal variant) - this.withExistingParent(itemRegistryObject.getId().getPath(), - mcLoc("item/generated")) - .override() - .model(new ModelFile.UncheckedModelFile(trimNameResLoc.getNamespace() + ":item/" + trimNameResLoc.getPath())) - .predicate(mcLoc("trim_type"), trimValue).end() - .texture("layer0", - Identifier.fromNamespaceAndPath(MOD_ID, - "item/" + itemRegistryObject.getId().getPath())); - }); - } - } - private ItemModelBuilder handheldItem(RegistryObject item) { - return withExistingParent(item.getId().getPath(), - Identifier.parse("item/handheld")).texture("layer0", - Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID,"item/" + item.getId().getPath())); - } - - public void buttonItem(RegistryObject block, RegistryObject baseBlock) { - this.withExistingParent(ForgeRegistries.BLOCKS.getKey(block.get()).getPath(), mcLoc("block/button_inventory")) - .texture("texture", Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, - "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); - } - - public void fenceItem(RegistryObject block, RegistryObject baseBlock) { - this.withExistingParent(ForgeRegistries.BLOCKS.getKey(block.get()).getPath(), mcLoc("block/fence_inventory")) - .texture("texture", Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, - "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); - } - - public void wallItem(RegistryObject block, RegistryObject baseBlock) { - this.withExistingParent(ForgeRegistries.BLOCKS.getKey(block.get()).getPath(), mcLoc("block/wall_inventory")) - .texture("wall", Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, - "block/" + ForgeRegistries.BLOCKS.getKey(baseBlock.get()).getPath())); - } - - private ItemModelBuilder simpleBlockItem(RegistryObject item) { - return withExistingParent(item.getId().getPath(), - Identifier.parse("item/generated")).texture("layer0", - Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID,"item/" + item.getId().getPath())); - } -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/datagen/ModItemTagProvider.java b/src/main/java/dev/sillyangel/nugget/datagen/ModItemTagProvider.java deleted file mode 100644 index 86ea67f..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModItemTagProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.item.ModItems; -import dev.sillyangel.nugget.util.ModTags; -import net.minecraft.core.HolderLookup; -import net.minecraft.tags.ItemTags; -import net.minecraft.data.PackOutput; -import net.minecraft.data.tags.ItemTagProvider; -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 pOutput, CompletableFuture pLookupProvider, CompletableFuture> pBlockTags, @Nullable ExistingFileHelper existingFileHelper) { - super(pOutput, pLookupProvider, pBlockTags, 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); - - tag(ItemTags.TRIMMABLE_ARMOR) - .add(ModItems.NUGGET_HELMET.get()) - .add(ModItems.NUGGET_CHESTPLATE.get()) - .add(ModItems.NUGGET_LEGGINGS.get()) - .add(ModItems.NUGGET_BOOTS.get()); - tag(ItemTags.TRIM_MATERIALS) - .add(ModItems.NUGGET.get()); -// tag(ItemTags.TRIM_TEMPLATES) -// .add(ModItems.NUGGET_SMITHING_TEMPLATE.get()); - tag(ModTags.Items.NUGGET_REPAIRS) - .add(ModItems.NUGGET.get()); - } -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/datagen/ModRecipeProvider.java b/src/main/java/dev/sillyangel/nugget/datagen/ModRecipeProvider.java deleted file mode 100644 index 7a190d7..0000000 --- a/src/main/java/dev/sillyangel/nugget/datagen/ModRecipeProvider.java +++ /dev/null @@ -1,173 +0,0 @@ -package dev.sillyangel.nugget.datagen; - -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.world.item.Items; -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.block.ModBlocks; -import dev.sillyangel.nugget.item.ModItems; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.*; -import net.minecraft.resources.Identifier; -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(HolderLookup.Provider lookup, RecipeOutput recipeOutput) { - super(lookup, recipeOutput); - } - - public static class Runner extends RecipeProvider.Runner { - public Runner(PackOutput output, CompletableFuture providerCompletableFuture) { - super(output, providerCompletableFuture); - } - - - @Override - protected RecipeProvider createRecipeProvider(HolderLookup.Provider provider, RecipeOutput recipeOutput) { - return new ModRecipeProvider(provider, recipeOutput); - } - - @Override - public String getName() { - return "Recipes"; - } - } - - @Override - protected void buildRecipes() { - List NUGGET_SMELTABLES = List.of(ModItems.RAW_NUGGET.get(), - ModBlocks.NUGGET_ORE.get(), ModBlocks.NUGGET_DEEPSLATE_ORE.get()); - - 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(this.output); - - shapeless(RecipeCategory.MISC, ModItems.NUGGET.get(), 9) - .requires(ModBlocks.NUGGET_BLOCK.get()) - .unlockedBy(getHasName(ModBlocks.NUGGET_BLOCK.get()), has(ModBlocks.NUGGET_BLOCK.get())).save(this.output); - - // RAW NUGGET - - shaped(RecipeCategory.MISC, ModBlocks.RAW_NUGGET_BLOCK.get()) - .pattern("AAA") - .pattern("AAA") - .pattern("AAA") - .define('A', ModItems.RAW_NUGGET.get()) - .unlockedBy(getHasName(ModItems.RAW_NUGGET.get()), has(ModItems.RAW_NUGGET.get())).save(this.output); - - shapeless(RecipeCategory.MISC, ModItems.RAW_NUGGET.get(), 9) - .requires(ModBlocks.RAW_NUGGET_BLOCK.get()) - .unlockedBy(getHasName(ModBlocks.RAW_NUGGET_BLOCK.get()), has(ModBlocks.RAW_NUGGET_BLOCK.get())).save(this.output); - // TOOLS - - //SWORD - shaped(RecipeCategory.COMBAT, ModItems.NUGGET_SWORD.get()) - .pattern(" A ") - .pattern(" A ") - .pattern(" B ") - .define('A', ModItems.NUGGET.get()) - .define('B', Items.STICK) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //PICAXE - shaped(RecipeCategory.TOOLS, ModItems.NUGGET_PICKAXE.get()) - .pattern("AAA") - .pattern(" B ") - .pattern(" B ") - .define('A', ModItems.NUGGET.get()) - .define('B', Items.STICK) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //AXE - shaped(RecipeCategory.TOOLS, ModItems.NUGGET_AXE.get()) - .pattern(" AA") - .pattern(" BA") - .pattern(" B ") - .define('A', ModItems.NUGGET.get()) - .define('B', Items.STICK) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //SHOVEL - shaped(RecipeCategory.TOOLS, ModItems.NUGGET_SHOVEL.get()) - .pattern(" A ") - .pattern(" B ") - .pattern(" B ") - .define('A', ModItems.NUGGET.get()) - .define('B', Items.STICK) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //HOE - shaped(RecipeCategory.TOOLS, ModItems.NUGGET_HOE.get()) - .pattern(" AA") - .pattern(" B ") - .pattern(" B ") - .define('A', ModItems.NUGGET.get()) - .define('B', Items.STICK) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - - // END OF TOOLS - - // start of armor - // head!?! - shaped(RecipeCategory.COMBAT, ModItems.NUGGET_HELMET.get()) - .pattern("AAA") - .pattern("A A") - .pattern(" ") - .define('A', ModItems.NUGGET.get()) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //shirt - shaped(RecipeCategory.COMBAT, ModItems.NUGGET_CHESTPLATE.get()) - .pattern("A A") - .pattern("AAA") - .pattern("AAA") - .define('A', ModItems.NUGGET.get()) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //pants? - shaped(RecipeCategory.COMBAT, ModItems.NUGGET_LEGGINGS.get()) - .pattern("AAA") - .pattern("A A") - .pattern("A A") - .define('A', ModItems.NUGGET.get()) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - //socks - shaped(RecipeCategory.COMBAT, ModItems.NUGGET_BOOTS.get()) - .pattern(" ") - .pattern("A A") - .pattern("A A") - .define('A', ModItems.NUGGET.get()) - .unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output); - - trimSmithing(ModItems.NUGGET_SMITHING_TEMPLATE.get(), ResourceKey.create(Registries.RECIPE, - Identifier.parse(getItemName(ModItems.NUGGET_SMITHING_TEMPLATE.get()) + "_smithing_trim"))); - - oreSmelting(this.output, NUGGET_SMELTABLES, RecipeCategory.MISC, ModItems.NUGGET.get(), 0.25f, 200, "nugget"); - oreBlasting(this.output, NUGGET_SMELTABLES, RecipeCategory.MISC, ModItems.NUGGET.get(), 0.25f, 100, "nugget"); - - - } - - protected 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 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 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/dev/sillyangel/nugget/trim/ModTrimMaterials.java b/src/main/java/dev/sillyangel/nugget/trim/ModTrimMaterials.java deleted file mode 100644 index ac8ee26..0000000 --- a/src/main/java/dev/sillyangel/nugget/trim/ModTrimMaterials.java +++ /dev/null @@ -1,31 +0,0 @@ -package dev.sillyangel.nugget.trim; - -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.item.ModItems; -import net.minecraft.util.Util; -import net.minecraft.core.registries.Registries; -import net.minecraft.data.worldgen.BootstrapContext; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.Style; -import net.minecraft.network.chat.TextColor; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.Identifier; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.equipment.trim.TrimMaterial; - -import java.util.Map; - -public class ModTrimMaterials { - public static final ResourceKey NUGGET = - ResourceKey.create(Registries.TRIM_MATERIAL, Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget")); - - public static void bootstrap(BootstrapContext context) { - register(context, NUGGET, ModItems.NUGGET.get(), Style.EMPTY.withColor(TextColor.parseColor("#f9b042").getOrThrow()), 0.1F); - } - private static void register(BootstrapContext context, ResourceKey trimKey, Item item, - Style style, float itemModelIndex) { - TrimMaterial trimmaterial = TrimMaterial.create(trimKey.location().getPath(), item, itemModelIndex, - Component.translatable(Util.makeDescriptionId("trim_material", trimKey.location())).withStyle(style), Map.of()); - context.register(trimKey, trimmaterial); - } -} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/Config.java b/src/main/java/dev/sillyangel/nuggetmod/Config.java similarity index 76% rename from src/main/java/dev/sillyangel/nugget/Config.java rename to src/main/java/dev/sillyangel/nuggetmod/Config.java index c11aa96..31419de 100644 --- a/src/main/java/dev/sillyangel/nugget/Config.java +++ b/src/main/java/dev/sillyangel/nuggetmod/Config.java @@ -1,4 +1,4 @@ -package dev.sillyangel.nugget; +package dev.sillyangel.nuggetmod; import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; @@ -8,12 +8,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.registries.ForgeRegistries; -import java.util.List; import java.util.Set; -import java.util.stream.Collectors; -// An example config class. This is not required, but it's a good idea to have one to keep your config organized. -// Demonstrates how to use Forge's config APIs @Mod.EventBusSubscriber(modid = NuggetMod.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class Config { @@ -21,7 +17,6 @@ public class Config static final ForgeConfigSpec SPEC = BUILDER.build(); - public static boolean logDirtBlock; public static Set items; private static boolean validateItemName(final Object obj) diff --git a/src/main/java/dev/sillyangel/nugget/NuggetMod.java b/src/main/java/dev/sillyangel/nuggetmod/NuggetMod.java similarity index 87% rename from src/main/java/dev/sillyangel/nugget/NuggetMod.java rename to src/main/java/dev/sillyangel/nuggetmod/NuggetMod.java index 1a29fb5..fa24221 100644 --- a/src/main/java/dev/sillyangel/nugget/NuggetMod.java +++ b/src/main/java/dev/sillyangel/nuggetmod/NuggetMod.java @@ -1,6 +1,7 @@ -package dev.sillyangel.nugget; +package dev.sillyangel.nuggetmod; import com.mojang.logging.LogUtils; +import dev.sillyangel.nuggetmod.villager.ModVillagers; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; @@ -10,10 +11,10 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; -import dev.sillyangel.nugget.item.ModCreativeModeTabs; -import dev.sillyangel.nugget.item.ModItems; -import dev.sillyangel.nugget.block.ModBlocks; -import dev.sillyangel.nugget.sound.ModSounds; +import dev.sillyangel.nuggetmod.item.ModCreativeModeTabs; +import dev.sillyangel.nuggetmod.item.ModItems; +import dev.sillyangel.nuggetmod.block.ModBlocks; +import dev.sillyangel.nuggetmod.sound.ModSounds; // Very important Comment // The value here should match an entry in the META-INF/mods.toml file @@ -38,7 +39,8 @@ public class NuggetMod { ModCreativeModeTabs.register(modBusGroup); // Register the Deferred Register to the mod event bus so sounds get registered ModSounds.register(modBusGroup); - + // + ModVillagers.register(modBusGroup); // Register the item to a creative tab BuildCreativeModeTabContentsEvent.BUS.addListener(this::addCreative); diff --git a/src/main/java/dev/sillyangel/nugget/block/ModBlocks.java b/src/main/java/dev/sillyangel/nuggetmod/block/ModBlocks.java similarity index 95% rename from src/main/java/dev/sillyangel/nugget/block/ModBlocks.java rename to src/main/java/dev/sillyangel/nuggetmod/block/ModBlocks.java index 35c7004..3a1af62 100644 --- a/src/main/java/dev/sillyangel/nugget/block/ModBlocks.java +++ b/src/main/java/dev/sillyangel/nuggetmod/block/ModBlocks.java @@ -1,10 +1,10 @@ -package dev.sillyangel.nugget.block; +package dev.sillyangel.nuggetmod.block; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.Identifier; -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.item.ModItems; +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.item.ModItems; import net.minecraft.util.valueproviders.UniformInt; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; diff --git a/src/main/java/dev/sillyangel/nuggetmod/event/ModEvents.java b/src/main/java/dev/sillyangel/nuggetmod/event/ModEvents.java new file mode 100644 index 0000000..fe37b62 --- /dev/null +++ b/src/main/java/dev/sillyangel/nuggetmod/event/ModEvents.java @@ -0,0 +1,109 @@ +package dev.sillyangel.nuggetmod.event; + +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.item.ModItems; +import dev.sillyangel.nuggetmod.villager.ModVillagers; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.world.entity.npc.villager.VillagerProfession; +import net.minecraft.world.entity.npc.villager.VillagerTrades; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.trading.ItemCost; +import net.minecraft.world.item.trading.MerchantOffer; +import net.minecraftforge.event.village.VillagerTradesEvent; +import net.minecraftforge.event.village.WandererTradesEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; + +import java.util.List; + +@Mod.EventBusSubscriber(modid = NuggetMod.MOD_ID) +public class ModEvents { + + @SubscribeEvent + public static void addCustomTrades(VillagerTradesEvent event) { + // Add trades to vanilla FARMER profession + if(event.getType() == VillagerProfession.FARMER) { + Int2ObjectMap> trades = event.getTrades(); + + trades.get(1).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 3), + new ItemStack(ModItems.NUGGET.get(), 8), 7, 2, 0.04f)); + } + + // Add trades to custom NUGGETER profession + if(event.getType().equals(ModVillagers.NUGGETER_KEY)) { + Int2ObjectMap> trades = event.getTrades(); + + // Level 1 trades + trades.get(1).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 5), + new ItemStack(ModItems.NUGGET.get(), 20), 4, 7, 0.04f)); + + trades.get(1).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.DIAMOND, 2), + new ItemStack(ModItems.RAW_NUGGET.get(), 12), 6, 5, 0.05f)); + + // Level 2 trades + trades.get(2).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.GOLD_INGOT, 8), + new ItemStack(ModItems.NUGGET_SWORD.get(), 1), 3, 10, 0.05f)); + + trades.get(2).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 10), + new ItemStack(ModItems.NUGGET_PICKAXE.get(), 1), 3, 10, 0.05f)); + + // Level 3 trades + trades.get(3).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 15), + new ItemStack(ModItems.NUGGET_HELMET.get(), 1), 2, 15, 0.05f)); + + trades.get(3).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 20), + new ItemStack(ModItems.NUGGET_CHESTPLATE.get(), 1), 2, 15, 0.05f)); + + // Level 4 trades + trades.get(4).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.DIAMOND, 5), + new ItemStack(ModItems.NUGGET_LEGGINGS.get(), 1), 2, 20, 0.05f)); + + trades.get(4).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 12), + new ItemStack(ModItems.NUGGET_BOOTS.get(), 1), 2, 20, 0.05f)); + + // Level 5 trades (Master) + trades.get(5).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 30), + new ItemStack(ModItems.NUGGET_HORSE_ARMOR.get(), 1), 1, 30, 0.1f)); + + trades.get(5).add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.DIAMOND, 10), + new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 1, 30, 0.1f)); + } + } + + @SubscribeEvent + public static void addWanderingTrades(WandererTradesEvent event) { + List pools = event.getPools(); + + if (pools.size() >= 1) { + // Add generic wandering trader trades (first pool) + List genericTrades = pools.get(0).getEntries(); + genericTrades.add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 12), + new ItemStack(ModItems.NUGGET.get(), 3), 2, 8, 0.2f)); + } + + if (pools.size() >= 2) { + // Add rare wandering trader trades (second pool) + List rareTrades = pools.get(1).getEntries(); + rareTrades.add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.DIAMOND, 8), + new ItemStack(ModItems.NUGGET_MUSIC_DISC.get(), 1), 1, 12, 0.2f)); + + rareTrades.add((pTrader, pRandom, pLevel) -> new MerchantOffer( + new ItemCost(Items.EMERALD, 25), + new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 1, 12, 0.2f)); + } + } +} diff --git a/src/main/java/dev/sillyangel/nugget/item/ModArmorMaterials.java b/src/main/java/dev/sillyangel/nuggetmod/item/ModArmorMaterials.java similarity index 90% rename from src/main/java/dev/sillyangel/nugget/item/ModArmorMaterials.java rename to src/main/java/dev/sillyangel/nuggetmod/item/ModArmorMaterials.java index 1cb30c5..a686e7d 100644 --- a/src/main/java/dev/sillyangel/nugget/item/ModArmorMaterials.java +++ b/src/main/java/dev/sillyangel/nuggetmod/item/ModArmorMaterials.java @@ -1,7 +1,7 @@ -package dev.sillyangel.nugget.item; +package dev.sillyangel.nuggetmod.item; -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.util.ModTags; +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.util.ModTags; import net.minecraft.util.Util; import net.minecraft.resources.Identifier; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/dev/sillyangel/nugget/item/ModCreativeModeTabs.java b/src/main/java/dev/sillyangel/nuggetmod/item/ModCreativeModeTabs.java similarity index 93% rename from src/main/java/dev/sillyangel/nugget/item/ModCreativeModeTabs.java rename to src/main/java/dev/sillyangel/nuggetmod/item/ModCreativeModeTabs.java index f792017..53ce2af 100644 --- a/src/main/java/dev/sillyangel/nugget/item/ModCreativeModeTabs.java +++ b/src/main/java/dev/sillyangel/nuggetmod/item/ModCreativeModeTabs.java @@ -1,4 +1,4 @@ -package dev.sillyangel.nugget.item; +package dev.sillyangel.nuggetmod.item; import net.minecraft.core.registries.Registries; import net.minecraft.network.chat.Component; @@ -7,8 +7,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.RegistryObject; -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.block.ModBlocks; +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.block.ModBlocks; public class ModCreativeModeTabs { public static final DeferredRegister CREATIVE_MODE_TABS = @@ -26,6 +26,7 @@ public class ModCreativeModeTabs { output.accept(ModItems.NUGGET_SHOVEL.get()); output.accept(ModItems.NUGGET_AXE.get()); output.accept(ModItems.NUGGET_HOE.get()); + output.accept(ModBlocks.NUGGET_BLOCK.get()); output.accept(ModItems.NUGGET_HELMET.get()); output.accept(ModItems.NUGGET_CHESTPLATE.get()); diff --git a/src/main/java/dev/sillyangel/nugget/item/ModFoodProperties.java b/src/main/java/dev/sillyangel/nuggetmod/item/ModFoodProperties.java similarity index 85% rename from src/main/java/dev/sillyangel/nugget/item/ModFoodProperties.java rename to src/main/java/dev/sillyangel/nuggetmod/item/ModFoodProperties.java index a360486..38aec66 100644 --- a/src/main/java/dev/sillyangel/nugget/item/ModFoodProperties.java +++ b/src/main/java/dev/sillyangel/nuggetmod/item/ModFoodProperties.java @@ -1,4 +1,4 @@ -package dev.sillyangel.nugget.item; +package dev.sillyangel.nuggetmod.item; import net.minecraft.world.food.FoodProperties; diff --git a/src/main/java/dev/sillyangel/nugget/item/ModItems.java b/src/main/java/dev/sillyangel/nuggetmod/item/ModItems.java similarity index 92% rename from src/main/java/dev/sillyangel/nugget/item/ModItems.java rename to src/main/java/dev/sillyangel/nuggetmod/item/ModItems.java index ee2cfd6..2da598a 100644 --- a/src/main/java/dev/sillyangel/nugget/item/ModItems.java +++ b/src/main/java/dev/sillyangel/nuggetmod/item/ModItems.java @@ -1,9 +1,9 @@ -package dev.sillyangel.nugget.item; +package dev.sillyangel.nuggetmod.item; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.equipment.ArmorType; -import dev.sillyangel.nugget.NuggetMod; +import dev.sillyangel.nuggetmod.NuggetMod; import net.minecraftforge.eventbus.api.bus.BusGroup; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -14,7 +14,7 @@ import net.minecraft.world.item.ShovelItem; import net.minecraft.world.item.AxeItem; import net.minecraft.world.item.HoeItem; import net.minecraft.world.item.SmithingTemplateItem; -import dev.sillyangel.nugget.sound.ModSounds; +import dev.sillyangel.nuggetmod.sound.ModSounds; public class ModItems { @@ -50,6 +50,11 @@ public class ModItems { () -> new HoeItem(ModToolTiers.NUGGET, 0, -3.0f, new Item.Properties() .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_hoe"))))); + public static final RegistryObject NUGGET_SPEAR = ITEMS.register("nugget_sword", + () -> new Item(new Item.Properties() + .setId(ResourceKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_sword"))) + .sword(ModToolTiers.NUGGET, 3.0F, -1F))); + // armor things public static final RegistryObject NUGGET_HELMET = ITEMS.register("nugget_helmet", diff --git a/src/main/java/dev/sillyangel/nugget/item/ModToolTiers.java b/src/main/java/dev/sillyangel/nuggetmod/item/ModToolTiers.java similarity index 74% rename from src/main/java/dev/sillyangel/nugget/item/ModToolTiers.java rename to src/main/java/dev/sillyangel/nuggetmod/item/ModToolTiers.java index 771a26f..3157d96 100644 --- a/src/main/java/dev/sillyangel/nugget/item/ModToolTiers.java +++ b/src/main/java/dev/sillyangel/nuggetmod/item/ModToolTiers.java @@ -1,7 +1,7 @@ -package dev.sillyangel.nugget.item; +package dev.sillyangel.nuggetmod.item; import net.minecraft.world.item.ToolMaterial; -import dev.sillyangel.nugget.util.ModTags; +import dev.sillyangel.nuggetmod.util.ModTags; public class ModToolTiers { public static final ToolMaterial NUGGET = new ToolMaterial(ModTags.Blocks.INCORRECT_FOR_NUGGET_TOOL, diff --git a/src/main/java/dev/sillyangel/nugget/sound/ModSounds.java b/src/main/java/dev/sillyangel/nuggetmod/sound/ModSounds.java similarity index 93% rename from src/main/java/dev/sillyangel/nugget/sound/ModSounds.java rename to src/main/java/dev/sillyangel/nuggetmod/sound/ModSounds.java index eb0bea5..19e1fbc 100644 --- a/src/main/java/dev/sillyangel/nugget/sound/ModSounds.java +++ b/src/main/java/dev/sillyangel/nuggetmod/sound/ModSounds.java @@ -1,9 +1,9 @@ -package dev.sillyangel.nugget.sound; +package dev.sillyangel.nuggetmod.sound; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.JukeboxSong; -import dev.sillyangel.nugget.NuggetMod; +import dev.sillyangel.nuggetmod.NuggetMod; import net.minecraft.resources.Identifier; import net.minecraft.sounds.SoundEvent; import net.minecraftforge.eventbus.api.bus.BusGroup; diff --git a/src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimMaterials.java b/src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimMaterials.java new file mode 100644 index 0000000..980ff11 --- /dev/null +++ b/src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimMaterials.java @@ -0,0 +1,36 @@ +package dev.sillyangel.nuggetmod.trim; + +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.item.ModArmorMaterials; +import net.minecraft.util.Util; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.worldgen.BootstrapContext; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.Style; +import net.minecraft.network.chat.TextColor; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.Identifier; +import net.minecraft.world.item.equipment.trim.MaterialAssetGroup; +import net.minecraft.world.item.equipment.trim.TrimMaterial; + +import java.util.Map; + +public class ModTrimMaterials { + private static final Identifier NUGGET_LOCATION = Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget"); + + public static final ResourceKey NUGGET = + ResourceKey.create(Registries.TRIM_MATERIAL, NUGGET_LOCATION); + + public static void bootstrap(BootstrapContext context) { + register(context, NUGGET, NUGGET_LOCATION, Style.EMPTY.withColor(TextColor.parseColor("#f9b042").getOrThrow())); + } + + private static void register(BootstrapContext context, ResourceKey trimKey, + Identifier assetId, Style style) { + MaterialAssetGroup.AssetInfo assetInfo = new MaterialAssetGroup.AssetInfo(assetId.getPath()); + TrimMaterial trimmaterial = new TrimMaterial( + new MaterialAssetGroup(assetInfo, Map.of(ModArmorMaterials.NUGGET_EQUIPMENT_ASSET, assetInfo)), + Component.translatable(Util.makeDescriptionId("trim_material", assetId)).withStyle(style)); + context.register(trimKey, trimmaterial); + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/trim/ModTrimPatterns.java b/src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimPatterns.java similarity index 61% rename from src/main/java/dev/sillyangel/nugget/trim/ModTrimPatterns.java rename to src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimPatterns.java index a4bed99..b0cd7a5 100644 --- a/src/main/java/dev/sillyangel/nugget/trim/ModTrimPatterns.java +++ b/src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimPatterns.java @@ -1,8 +1,8 @@ -package dev.sillyangel.nugget.trim; +package dev.sillyangel.nuggetmod.trim; import net.minecraft.world.item.equipment.trim.TrimPattern; -import dev.sillyangel.nugget.NuggetMod; -import dev.sillyangel.nugget.item.ModItems; +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.item.ModItems; import net.minecraft.util.Util; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; @@ -10,19 +10,19 @@ import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.Identifier; import net.minecraft.world.item.Item; -import net.minecraftforge.registries.ForgeRegistries; public class ModTrimPatterns { - public static final ResourceKey NUGGET = ResourceKey.create(Registries.TRIM_PATTERN, - Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget")); + private static final Identifier NUGGET_LOCATION = Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget"); + + public static final ResourceKey NUGGET = ResourceKey.create(Registries.TRIM_PATTERN, NUGGET_LOCATION); public static void bootstrap(BootstrapContext context) { - register(context, ModItems.NUGGET_SMITHING_TEMPLATE.get(), NUGGET); + register(context, ModItems.NUGGET_SMITHING_TEMPLATE.get(), NUGGET, NUGGET_LOCATION); } - private static void register(BootstrapContext context, Item item, ResourceKey key) { - TrimPattern trimPattern = new TrimPattern(key.location(), ForgeRegistries.ITEMS.getHolder(item).get(), - Component.translatable(Util.makeDescriptionId("trim_pattern", key.location())), false); + private static void register(BootstrapContext context, Item item, ResourceKey key, Identifier assetId) { + TrimPattern trimPattern = new TrimPattern(assetId, + Component.translatable(Util.makeDescriptionId("trim_pattern", assetId)), false); context.register(key, trimPattern); } } \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/util/ModItemProperites.java b/src/main/java/dev/sillyangel/nuggetmod/util/ModItemProperites.java similarity index 65% rename from src/main/java/dev/sillyangel/nugget/util/ModItemProperites.java rename to src/main/java/dev/sillyangel/nuggetmod/util/ModItemProperites.java index ea40ed9..e4d38ef 100644 --- a/src/main/java/dev/sillyangel/nugget/util/ModItemProperites.java +++ b/src/main/java/dev/sillyangel/nuggetmod/util/ModItemProperites.java @@ -1,4 +1,4 @@ -package dev.sillyangel.nugget.util; +package dev.sillyangel.nuggetmod.util; public class ModItemProperites { // i dont know what to put here?! diff --git a/src/main/java/dev/sillyangel/nugget/util/ModTags.java b/src/main/java/dev/sillyangel/nuggetmod/util/ModTags.java similarity index 92% rename from src/main/java/dev/sillyangel/nugget/util/ModTags.java rename to src/main/java/dev/sillyangel/nuggetmod/util/ModTags.java index f2074f5..2e8c69e 100644 --- a/src/main/java/dev/sillyangel/nugget/util/ModTags.java +++ b/src/main/java/dev/sillyangel/nuggetmod/util/ModTags.java @@ -1,6 +1,6 @@ -package dev.sillyangel.nugget.util; +package dev.sillyangel.nuggetmod.util; -import dev.sillyangel.nugget.NuggetMod; +import dev.sillyangel.nuggetmod.NuggetMod; import net.minecraft.resources.Identifier; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; diff --git a/src/main/java/dev/sillyangel/nuggetmod/villager/ModVillagers.java b/src/main/java/dev/sillyangel/nuggetmod/villager/ModVillagers.java new file mode 100644 index 0000000..0f9db62 --- /dev/null +++ b/src/main/java/dev/sillyangel/nuggetmod/villager/ModVillagers.java @@ -0,0 +1,42 @@ +package dev.sillyangel.nuggetmod.villager; + +import com.google.common.collect.ImmutableSet; +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.block.ModBlocks; +import dev.sillyangel.nuggetmod.sound.ModSounds; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.resources.Identifier; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.entity.ai.village.poi.PoiType; +import net.minecraft.world.entity.npc.villager.VillagerProfession; +import net.minecraftforge.eventbus.api.bus.BusGroup; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class ModVillagers { + public static final DeferredRegister POI_TYPES = + DeferredRegister.create(ForgeRegistries.POI_TYPES, NuggetMod.MOD_ID); + public static final DeferredRegister VILLAGER_PROFESSIONS = + DeferredRegister.create(ForgeRegistries.VILLAGER_PROFESSIONS, NuggetMod.MOD_ID); + + public static final ResourceKey NUGGETER_KEY = + ResourceKey.create(Registries.VILLAGER_PROFESSION, Identifier.fromNamespaceAndPath(NuggetMod.MOD_ID, "nuggeter")); + + public static final RegistryObject NUGGETER_POI = POI_TYPES.register("nuggeter_poi", + () -> new PoiType(ImmutableSet.copyOf(ModBlocks.NUGGET_BLOCK.get().getStateDefinition().getPossibleStates()), + 1, 1)); + + public static final RegistryObject NUGGETER = VILLAGER_PROFESSIONS.register("nuggeter", + () -> new VillagerProfession(Component.literal("Nuggeter"), holder -> holder.value() == NUGGETER_POI.get(), + holder -> holder.value() == NUGGETER_POI.get(), ImmutableSet.of(), ImmutableSet.of(), + ModSounds.NUGGET_THEME.get())); + + + + public static void register(BusGroup eventBus) { + POI_TYPES.register(eventBus); + VILLAGER_PROFESSIONS.register(eventBus); + } +} \ No newline at end of file diff --git a/src/main/java/dev/sillyangel/nugget/worldgen/ModBiomeModifiers.java b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModBiomeModifiers.java similarity index 93% rename from src/main/java/dev/sillyangel/nugget/worldgen/ModBiomeModifiers.java rename to src/main/java/dev/sillyangel/nuggetmod/worldgen/ModBiomeModifiers.java index fc61992..7996ea6 100644 --- a/src/main/java/dev/sillyangel/nugget/worldgen/ModBiomeModifiers.java +++ b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModBiomeModifiers.java @@ -1,10 +1,10 @@ -package dev.sillyangel.nugget.worldgen; +package dev.sillyangel.nuggetmod.worldgen; import net.minecraft.core.HolderSet; import net.minecraft.tags.BiomeTags; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraftforge.common.world.ForgeBiomeModifiers; -import dev.sillyangel.nugget.NuggetMod; +import dev.sillyangel.nuggetmod.NuggetMod; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.resources.ResourceKey; diff --git a/src/main/java/dev/sillyangel/nugget/worldgen/ModConfiguredFeatures.java b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModConfiguredFeatures.java similarity index 94% rename from src/main/java/dev/sillyangel/nugget/worldgen/ModConfiguredFeatures.java rename to src/main/java/dev/sillyangel/nuggetmod/worldgen/ModConfiguredFeatures.java index 4e14487..54e61f5 100644 --- a/src/main/java/dev/sillyangel/nugget/worldgen/ModConfiguredFeatures.java +++ b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModConfiguredFeatures.java @@ -1,10 +1,10 @@ -package dev.sillyangel.nugget.worldgen; +package dev.sillyangel.nuggetmod.worldgen; import net.minecraft.tags.BlockTags; import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; -import dev.sillyangel.nugget.NuggetMod; +import dev.sillyangel.nuggetmod.NuggetMod; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; import net.minecraft.resources.ResourceKey; @@ -12,7 +12,7 @@ import net.minecraft.resources.Identifier; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfiguration; -import dev.sillyangel.nugget.block.ModBlocks; +import dev.sillyangel.nuggetmod.block.ModBlocks; import java.util.List; diff --git a/src/main/java/dev/sillyangel/nugget/worldgen/ModOrePlacement.java b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModOrePlacement.java similarity index 94% rename from src/main/java/dev/sillyangel/nugget/worldgen/ModOrePlacement.java rename to src/main/java/dev/sillyangel/nuggetmod/worldgen/ModOrePlacement.java index fb62f85..29abcdf 100644 --- a/src/main/java/dev/sillyangel/nugget/worldgen/ModOrePlacement.java +++ b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModOrePlacement.java @@ -1,4 +1,4 @@ -package dev.sillyangel.nugget.worldgen; +package dev.sillyangel.nuggetmod.worldgen; import net.minecraft.world.level.levelgen.placement.*; diff --git a/src/main/java/dev/sillyangel/nugget/worldgen/ModPlacedFeatures.java b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModPlacedFeatures.java similarity index 95% rename from src/main/java/dev/sillyangel/nugget/worldgen/ModPlacedFeatures.java rename to src/main/java/dev/sillyangel/nuggetmod/worldgen/ModPlacedFeatures.java index c35781f..d76ca78 100644 --- a/src/main/java/dev/sillyangel/nugget/worldgen/ModPlacedFeatures.java +++ b/src/main/java/dev/sillyangel/nuggetmod/worldgen/ModPlacedFeatures.java @@ -1,8 +1,8 @@ -package dev.sillyangel.nugget.worldgen; +package dev.sillyangel.nuggetmod.worldgen; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; -import dev.sillyangel.nugget.NuggetMod; +import dev.sillyangel.nuggetmod.NuggetMod; import net.minecraft.core.Holder; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstrapContext; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 9924ede..c821d98 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -26,7 +26,7 @@ displayName="${mod_name}" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://docs.minecraftforge.net/en/latest/misc/updatechecker/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI -displayURL="https://sillyangel.dev/" #optional +displayURL="https://modrinth.com/mod/nuggetmod/" #optional # A file name (in the root of the mod JAR) containing a logo for display logoFile="splash.png" #optional # A text field displayed in the mod UI diff --git a/src/main/resources/assets/minecraft/atlases/armor_trims.json b/src/main/resources/assets/minecraft/atlases/armor_trims.json index 2e8e259..863859f 100644 --- a/src/main/resources/assets/minecraft/atlases/armor_trims.json +++ b/src/main/resources/assets/minecraft/atlases/armor_trims.json @@ -4,12 +4,12 @@ { "type": "paletted_permutations", "textures": [ - "trims/entity/humanoid/coast", - "trims/entity/humanoid_leggings/coast", "trims/entity/humanoid/sentry", "trims/entity/humanoid_leggings/sentry", "trims/entity/humanoid/dune", "trims/entity/humanoid_leggings/dune", + "trims/entity/humanoid/coast", + "trims/entity/humanoid_leggings/coast", "trims/entity/humanoid/wild", "trims/entity/humanoid_leggings/wild", "trims/entity/humanoid/ward", @@ -45,22 +45,25 @@ ], "palette_key": "trims/color_palettes/trim_palette", "permutations": { - "quartz": "trims/color_palettes/quartz", - "iron": "trims/color_palettes/iron", - "gold": "trims/color_palettes/gold", - "diamond": "trims/color_palettes/diamond", - "netherite": "trims/color_palettes/netherite", - "redstone": "trims/color_palettes/redstone", - "copper": "trims/color_palettes/copper", - "emerald": "trims/color_palettes/emerald", - "lapis": "trims/color_palettes/lapis", "amethyst": "trims/color_palettes/amethyst", - "iron_darker": "trims/color_palettes/iron_darker", - "gold_darker": "trims/color_palettes/gold_darker", + "copper": "trims/color_palettes/copper", + "copper_darker": "trims/color_palettes/copper_darker", + "diamond": "trims/color_palettes/diamond", "diamond_darker": "trims/color_palettes/diamond_darker", + "emerald": "trims/color_palettes/emerald", + "gold": "trims/color_palettes/gold", + "gold_darker": "trims/color_palettes/gold_darker", + "iron": "trims/color_palettes/iron", + "iron_darker": "trims/color_palettes/iron_darker", + "lapis": "trims/color_palettes/lapis", + "netherite": "trims/color_palettes/netherite", "netherite_darker": "trims/color_palettes/netherite_darker", + "quartz": "trims/color_palettes/quartz", + "redstone": "trims/color_palettes/redstone", + "resin": "trims/color_palettes/resin", "nugget": "nuggetmod:trims/color_palettes/nugget" } } ] -} \ No newline at end of file +} + diff --git a/src/generated/resources/assets/nuggetmod/blockstates/nugget_block.json b/src/main/resources/assets/nuggetmod/blockstates/nugget_block.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/blockstates/nugget_block.json rename to src/main/resources/assets/nuggetmod/blockstates/nugget_block.json diff --git a/src/generated/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json b/src/main/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json rename to src/main/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json diff --git a/src/generated/resources/assets/nuggetmod/blockstates/nugget_ore.json b/src/main/resources/assets/nuggetmod/blockstates/nugget_ore.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/blockstates/nugget_ore.json rename to src/main/resources/assets/nuggetmod/blockstates/nugget_ore.json diff --git a/src/generated/resources/assets/nuggetmod/blockstates/raw_nugget_block.json b/src/main/resources/assets/nuggetmod/blockstates/raw_nugget_block.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/blockstates/raw_nugget_block.json rename to src/main/resources/assets/nuggetmod/blockstates/raw_nugget_block.json diff --git a/src/main/resources/assets/nuggetmod/models/equipment/nugget.json b/src/main/resources/assets/nuggetmod/equipment/nugget.json similarity index 76% rename from src/main/resources/assets/nuggetmod/models/equipment/nugget.json rename to src/main/resources/assets/nuggetmod/equipment/nugget.json index 04aa128..59931b8 100644 --- a/src/main/resources/assets/nuggetmod/models/equipment/nugget.json +++ b/src/main/resources/assets/nuggetmod/equipment/nugget.json @@ -1,5 +1,10 @@ { "layers": { + "wolf_body": [ + { + "texture": "nuggetmod:nugget" + } + ], "horse_body": [ { "texture": "nuggetmod:nugget" diff --git a/src/main/resources/assets/nuggetmod/icon.png b/src/main/resources/assets/nuggetmod/icon.png new file mode 100644 index 0000000..fe2ea3c Binary files /dev/null and b/src/main/resources/assets/nuggetmod/icon.png differ diff --git a/src/main/resources/assets/nuggetmod/items/nugget.json b/src/main/resources/assets/nuggetmod/items/nugget.json new file mode 100644 index 0000000..1ec7aa5 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json b/src/main/resources/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json new file mode 100644 index 0000000..281de1b --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_armor_trim_smithing_template" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_axe.json b/src/main/resources/assets/nuggetmod/items/nugget_axe.json new file mode 100644 index 0000000..dbe11cd --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_axe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_block.json b/src/main/resources/assets/nuggetmod/items/nugget_block.json new file mode 100644 index 0000000..ccc5e02 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:block/nugget_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_boots.json b/src/main/resources/assets/nuggetmod/items/nugget_boots.json new file mode 100644 index 0000000..bc2af0b --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_boots.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_boots" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_chestplate.json b/src/main/resources/assets/nuggetmod/items/nugget_chestplate.json new file mode 100644 index 0000000..2098710 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_chestplate.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_chestplate" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_deepslate_ore.json b/src/main/resources/assets/nuggetmod/items/nugget_deepslate_ore.json new file mode 100644 index 0000000..580e9b6 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_deepslate_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:block/nugget_deepslate_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_helmet.json b/src/main/resources/assets/nuggetmod/items/nugget_helmet.json new file mode 100644 index 0000000..e0e4483 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_helmet.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_helmet" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_hoe.json b/src/main/resources/assets/nuggetmod/items/nugget_hoe.json new file mode 100644 index 0000000..3a80640 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_hoe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_horse_armor.json b/src/main/resources/assets/nuggetmod/items/nugget_horse_armor.json new file mode 100644 index 0000000..d555d27 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_horse_armor.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_horse_armor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_leggings.json b/src/main/resources/assets/nuggetmod/items/nugget_leggings.json new file mode 100644 index 0000000..1276023 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_leggings.json @@ -0,0 +1,89 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_quartz_trim" + }, + "when": "minecraft:quartz" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_iron_trim" + }, + "when": "minecraft:iron" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_netherite_trim" + }, + "when": "minecraft:netherite" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_redstone_trim" + }, + "when": "minecraft:redstone" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_copper_trim" + }, + "when": "minecraft:copper" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_gold_trim" + }, + "when": "minecraft:gold" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_emerald_trim" + }, + "when": "minecraft:emerald" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_diamond_trim" + }, + "when": "minecraft:diamond" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_lapis_trim" + }, + "when": "minecraft:lapis" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_amethyst_trim" + }, + "when": "minecraft:amethyst" + }, + { + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings_resin_trim" + }, + "when": "minecraft:resin" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_leggings" + }, + "property": "minecraft:trim_material" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_music_disc.json b/src/main/resources/assets/nuggetmod/items/nugget_music_disc.json new file mode 100644 index 0000000..3961ff9 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_music_disc.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_music_disc" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_ore.json b/src/main/resources/assets/nuggetmod/items/nugget_ore.json new file mode 100644 index 0000000..b5ed8ef --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_ore.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:block/nugget_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_pickaxe.json b/src/main/resources/assets/nuggetmod/items/nugget_pickaxe.json new file mode 100644 index 0000000..eba4ef7 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_shovel.json b/src/main/resources/assets/nuggetmod/items/nugget_shovel.json new file mode 100644 index 0000000..431cbc4 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_shovel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_spear.json b/src/main/resources/assets/nuggetmod/items/nugget_spear.json new file mode 100644 index 0000000..ff1c7dd --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_spear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_spear" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/nugget_sword.json b/src/main/resources/assets/nuggetmod/items/nugget_sword.json new file mode 100644 index 0000000..24c9aed --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/nugget_sword.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/nugget_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/raw_nugget.json b/src/main/resources/assets/nuggetmod/items/raw_nugget.json new file mode 100644 index 0000000..6ee18c0 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/raw_nugget.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:item/raw_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/items/raw_nugget_block.json b/src/main/resources/assets/nuggetmod/items/raw_nugget_block.json new file mode 100644 index 0000000..4af1ab9 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/items/raw_nugget_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "nuggetmod:block/raw_nugget_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/lang/en_us.json b/src/main/resources/assets/nuggetmod/lang/en_us.json index 7fc24d4..cc2495e 100644 --- a/src/main/resources/assets/nuggetmod/lang/en_us.json +++ b/src/main/resources/assets/nuggetmod/lang/en_us.json @@ -1,40 +1,50 @@ -{ - "item.nuggetmod.raw_nugget": "Raw Nugget", - "item.nuggetmod.nugget": "Nugget", - - "item.nuggetmod.nugget_block": "Nugget Block", - "item.nuggetmod.raw_nugget_block": "Raw Nugget Block", - "item.nuggetmod.nugget_ore": "Nugget Ore", - "item.nuggetmod.nugget_deepslate_ore": "Nugget Deepslate Ore", - - "item.nuggetmod.nugget_sword": "Nugget Sword", - "item.nuggetmod.nugget_pickaxe": "Nugget Pickaxe", - "item.nuggetmod.nugget_shovel": "Nugget Shovel", - "item.nuggetmod.nugget_axe": "Nugget Axe", - "item.nuggetmod.nugget_hoe": "Nugget Hoe", - - "item.nuggetmod.nugget_music_disc": "Nugget Theme", - "item.nuggetmod.nugget_music_disc.desc": "Gegagedigedagedago", - - - "item.nuggetmod.nugget_horse_armor": "Nugget Horse Armor", - "item.nuggetmod.nugget_armor_trim_smithing_template": "§6Nugget Armor Trim", - - "item.nuggetmod.nugget_helmet": "Nugget Helmet", - "item.nuggetmod.nugget_chestplate": "Nugget Chestplate", - "item.nuggetmod.nugget_leggings": "Nugget Leggings", - "item.nuggetmod.nugget_boots": "Nugget Boots", - - "creativetab.nuggetmod.nugget_items": "Nugget Items", - "creativetab.nuggetmod.nugget_blocks": "Nugget Blocks", - - "item.nuggetmod.nugget.tooltip": "THE NUGGET", - - "trim_material.nuggetmod.nugget": "Nugget Material", - "trim_pattern.nuggetmod.nugget_trim_material": "Nugget Trim", - "trim_pattern.nuggetmod.nugget": "Nugget Trim", - - - "painting.nuggetmod.nugget_painting.title": "Nugget Painting", - "painting.nuggetmod.nugget_painting.author": "Nugget Mod" +{ + "item.nuggetmod.raw_nugget": "Raw Nugget", + "item.nuggetmod.nugget": "Nugget", + + "block.nuggetmod.nugget_block": "Nugget Block", + "block.nuggetmod.raw_nugget_block": "Raw Nugget Block", + "block.nuggetmod.nugget_ore": "Nugget Ore", + "block.nuggetmod.nugget_deepslate_ore": "Nugget Deepslate Ore", + + "item.nuggetmod.nugget_sword": "Nugget Sword", + "item.nuggetmod.nugget_pickaxe": "Nugget Pickaxe", + "item.nuggetmod.nugget_shovel": "Nugget Shovel", + "item.nuggetmod.nugget_axe": "Nugget Axe", + "item.nuggetmod.nugget_hoe": "Nugget Hoe", + "item.nuggetmod.nugget_bow": "Nugget Bow", + "item.nuggetmod.nugget_crossbow": "Nugget Crossbow", + "item.nuggetmod.nugget_trident": "Nugget Trident", + "item.nuggetmod.nugget_fishing_rod": "Nugget Fishing Rod", + "item.nuggetmod.nugget_flint_and_steel": "Nugget Flint and Steel", + "item.nuggetmod.nugget_shears": "Nugget Shears", + "item.nuggetmod.nugget_shield": "Nugget Shield", + "item.nuggetmod.nugget_spear": "Nugget Spear", + + "item.nuggetmod.nugget_music_disc": "Nugget Theme", + "item.nuggetmod.nugget_music_disc.desc": "Gegagedigedagedago", + + + "item.nuggetmod.nugget_horse_armor": "Nugget Horse Armor", + "item.nuggetmod.nugget_armor_trim_smithing_template": "Smithing Template", + + "item.nuggetmod.nugget_helmet": "Nugget Helmet", + "item.nuggetmod.nugget_chestplate": "Nugget Chestplate", + "item.nuggetmod.nugget_leggings": "Nugget Leggings", + "item.nuggetmod.nugget_boots": "Nugget Boots", + + "creativetab.nuggetmod.nugget_items": "Nugget Items", + "creativetab.nuggetmod.nugget_blocks": "Nugget Blocks", + + "item.nuggetmod.nugget.tooltip": "THE NUGGET", + + "entity.minecraft.villager.nuggeter": "Nuggeter", + + "trim_material.nuggetmod.nugget": "Nugget Material", + "trim_pattern.nuggetmod.nugget_trim_material": "Nugget Trim", + "trim_pattern.nuggetmod.nugget_armor_trim_smithing_template": "§6Nugget Armor Trim", + "trim_pattern.nuggetmod.nugget": "Nugget Trim", + + "painting.nuggetmod.nugget_painting.title": "Nugget Painting", + "painting.nuggetmod.nugget_painting.author": "Nugget Mod" } \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/lang/es_mx.json b/src/main/resources/assets/nuggetmod/lang/es_mx.json index a9f21cc..decd32e 100644 --- a/src/main/resources/assets/nuggetmod/lang/es_mx.json +++ b/src/main/resources/assets/nuggetmod/lang/es_mx.json @@ -2,10 +2,10 @@ "item.nuggetmod.raw_nugget": "Nugget Crudo", "item.nuggetmod.nugget": "Nugget", - "item.nuggetmod.nugget_block": "Bloque de Nuggets", - "item.nuggetmod.raw_nugget_block": "Bloque de Nuggets Crudos", - "item.nuggetmod.nugget_ore": "Mineral de Nuggets", - "item.nuggetmod.nugget_deepslate_ore": "Mineral de Nuggets de Pizca Profunda", + "block.nuggetmod.nugget_block": "Bloque de Nuggets", + "block.nuggetmod.raw_nugget_block": "Bloque de Nuggets Crudos", + "block.nuggetmod.nugget_ore": "Mineral de Nuggets", + "block.nuggetmod.nugget_deepslate_ore": "Mineral de Nuggets de Pizca Profunda", "item.nuggetmod.nugget_sword": "Espada de Nuggets", "item.nuggetmod.nugget_pickaxe": "Pico de Nuggets", @@ -17,7 +17,7 @@ "item.nuggetmod.nugget_music_disc.desc": "Gegagedigedagedago", "item.nuggetmod.nugget_horse_armor": "Armadura de Caballo de Nuggets", - "item.nuggetmod.nugget_armor_trim_smithing_template": "§6Adorno de Armadura de Nuggets", + "item.nuggetmod.nugget_armor_trim_smithing_template": "Plantilla de Adorno de Nuggets", "item.nuggetmod.nugget_helmet": "Casco de Nuggets", "item.nuggetmod.nugget_chestplate": "Peto de Nuggets", diff --git a/src/generated/resources/assets/nuggetmod/models/block/nugget_block.json b/src/main/resources/assets/nuggetmod/models/block/nugget_block.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/block/nugget_block.json rename to src/main/resources/assets/nuggetmod/models/block/nugget_block.json diff --git a/src/generated/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json b/src/main/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json rename to src/main/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json diff --git a/src/generated/resources/assets/nuggetmod/models/block/nugget_ore.json b/src/main/resources/assets/nuggetmod/models/block/nugget_ore.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/block/nugget_ore.json rename to src/main/resources/assets/nuggetmod/models/block/nugget_ore.json diff --git a/src/generated/resources/assets/nuggetmod/models/block/raw_nugget_block.json b/src/main/resources/assets/nuggetmod/models/block/raw_nugget_block.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/block/raw_nugget_block.json rename to src/main/resources/assets/nuggetmod/models/block/raw_nugget_block.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget.json b/src/main/resources/assets/nuggetmod/models/item/nugget.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget.json rename to src/main/resources/assets/nuggetmod/models/item/nugget.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json b/src/main/resources/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_axe.json b/src/main/resources/assets/nuggetmod/models/item/nugget_axe.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_axe.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_axe.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_boots.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots.json new file mode 100644 index 0000000..2640a31 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_boots.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_boots" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_copper_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_copper_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_copper_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_copper_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_gold_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_gold_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_gold_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_gold_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_iron_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_iron_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_iron_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_iron_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_boots_resin_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_resin_trim.json new file mode 100644 index 0000000..fd74c8c --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_boots_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_boots", + "layer1": "minecraft:trims/items/boots_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate.json new file mode 100644 index 0000000..d0023a6 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_chestplate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json new file mode 100644 index 0000000..f312dcd --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_chestplate", + "layer1": "minecraft:trims/items/chestplate_trim_resin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_helmet.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet.json new file mode 100644 index 0000000..c825b18 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_helmet" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json new file mode 100644 index 0000000..a4a354d --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_helmet", + "layer1": "minecraft:trims/items/helmet_trim_resin" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_hoe.json b/src/main/resources/assets/nuggetmod/models/item/nugget_hoe.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_hoe.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_hoe.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_horse_armor.json b/src/main/resources/assets/nuggetmod/models/item/nugget_horse_armor.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_horse_armor.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_horse_armor.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_leggings.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings.json new file mode 100644 index 0000000..85b1921 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_leggings" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json new file mode 100644 index 0000000..7d760f0 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "nuggetmod:item/nugget_leggings", + "layer1": "minecraft:trims/items/leggings_trim_resin" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_music_disc.json b/src/main/resources/assets/nuggetmod/models/item/nugget_music_disc.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_music_disc.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_music_disc.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_pickaxe.json b/src/main/resources/assets/nuggetmod/models/item/nugget_pickaxe.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_pickaxe.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_pickaxe.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_shovel.json b/src/main/resources/assets/nuggetmod/models/item/nugget_shovel.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_shovel.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_shovel.json diff --git a/src/main/resources/assets/nuggetmod/models/item/nugget_spear.json b/src/main/resources/assets/nuggetmod/models/item/nugget_spear.json new file mode 100644 index 0000000..060eaaf --- /dev/null +++ b/src/main/resources/assets/nuggetmod/models/item/nugget_spear.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/spear_in_hand", + "textures": { + "layer0": "nuggetmod:item/nugget_spear" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/nuggetmod/models/item/nugget_sword.json b/src/main/resources/assets/nuggetmod/models/item/nugget_sword.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/nugget_sword.json rename to src/main/resources/assets/nuggetmod/models/item/nugget_sword.json diff --git a/src/generated/resources/assets/nuggetmod/models/item/raw_nugget.json b/src/main/resources/assets/nuggetmod/models/item/raw_nugget.json similarity index 100% rename from src/generated/resources/assets/nuggetmod/models/item/raw_nugget.json rename to src/main/resources/assets/nuggetmod/models/item/raw_nugget.json diff --git a/src/main/resources/assets/nuggetmod/particles/nugget_particle.json b/src/main/resources/assets/nuggetmod/particles/nugget_particle.json new file mode 100644 index 0000000..ee87d54 --- /dev/null +++ b/src/main/resources/assets/nuggetmod/particles/nugget_particle.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "nuggetmod:nugget" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/nuggetmod/textures/entity/equipment/horse_body/nugget.png b/src/main/resources/assets/nuggetmod/textures/entity/equipment/horse_body/nugget.png index 963fbfe..0ce86b1 100644 Binary files a/src/main/resources/assets/nuggetmod/textures/entity/equipment/horse_body/nugget.png and b/src/main/resources/assets/nuggetmod/textures/entity/equipment/horse_body/nugget.png differ diff --git a/src/main/resources/assets/nuggetmod/textures/entity/villager/profession/nuggeter.png b/src/main/resources/assets/nuggetmod/textures/entity/villager/profession/nuggeter.png new file mode 100644 index 0000000..83a6c17 Binary files /dev/null and b/src/main/resources/assets/nuggetmod/textures/entity/villager/profession/nuggeter.png differ diff --git a/src/main/resources/assets/nuggetmod/textures/item/nugget_spear.png b/src/main/resources/assets/nuggetmod/textures/item/nugget_spear.png new file mode 100644 index 0000000..595cf2d Binary files /dev/null and b/src/main/resources/assets/nuggetmod/textures/item/nugget_spear.png differ diff --git a/src/main/resources/assets/nuggetmod/textures/item/nugget_spear_in_hand.png b/src/main/resources/assets/nuggetmod/textures/item/nugget_spear_in_hand.png new file mode 100644 index 0000000..745b911 Binary files /dev/null and b/src/main/resources/assets/nuggetmod/textures/item/nugget_spear_in_hand.png differ diff --git a/src/main/resources/assets/nuggetmod/textures/particle/nugget.png b/src/main/resources/assets/nuggetmod/textures/particle/nugget.png new file mode 100644 index 0000000..ab22a0a Binary files /dev/null and b/src/main/resources/assets/nuggetmod/textures/particle/nugget.png differ diff --git a/src/main/resources/data/minecraft/tags/item/axes.json b/src/main/resources/data/minecraft/tags/item/axes.json deleted file mode 100644 index 04bc747..0000000 --- a/src/main/resources/data/minecraft/tags/item/axes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_axe" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/chest_armor.json b/src/main/resources/data/minecraft/tags/item/chest_armor.json deleted file mode 100644 index 1ec2c8c..0000000 --- a/src/main/resources/data/minecraft/tags/item/chest_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_chestplate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/foot_armor.json b/src/main/resources/data/minecraft/tags/item/foot_armor.json deleted file mode 100644 index 11bacdb..0000000 --- a/src/main/resources/data/minecraft/tags/item/foot_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_boots" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/head_armor.json b/src/main/resources/data/minecraft/tags/item/head_armor.json deleted file mode 100644 index 9a36b3d..0000000 --- a/src/main/resources/data/minecraft/tags/item/head_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_helmet" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/hoes.json b/src/main/resources/data/minecraft/tags/item/hoes.json deleted file mode 100644 index 91c5fee..0000000 --- a/src/main/resources/data/minecraft/tags/item/hoes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_hoe" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/leg_armor.json b/src/main/resources/data/minecraft/tags/item/leg_armor.json deleted file mode 100644 index af0cee8..0000000 --- a/src/main/resources/data/minecraft/tags/item/leg_armor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_leggings" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/pickaxes.json b/src/main/resources/data/minecraft/tags/item/pickaxes.json deleted file mode 100644 index 9313699..0000000 --- a/src/main/resources/data/minecraft/tags/item/pickaxes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_pickaxe" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/shovels.json b/src/main/resources/data/minecraft/tags/item/shovels.json deleted file mode 100644 index ad4b90e..0000000 --- a/src/main/resources/data/minecraft/tags/item/shovels.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_shovel" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/item/swords.json b/src/main/resources/data/minecraft/tags/item/swords.json deleted file mode 100644 index bc5e68b..0000000 --- a/src/main/resources/data/minecraft/tags/item/swords.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "nuggetmod:nugget_sword" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json b/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json new file mode 100644 index 0000000..7885626 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "nuggetmod:nuggeter_poi", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget.json b/src/main/resources/data/nuggetmod/advancement/recipes/building_blocks/nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget.json rename to src/main/resources/data/nuggetmod/advancement/recipes/building_blocks/nugget.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_boots.json b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_boots.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_boots.json rename to src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_boots.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json rename to src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json rename to src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json rename to src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json diff --git a/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_spear.json b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_spear.json new file mode 100644 index 0000000..af09564 --- /dev/null +++ b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_spear.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_nugget": { + "conditions": { + "items": [ + { + "items": "nuggetmod:nugget" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "nuggetmod:nugget_spear" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_the_recipe", + "has_nugget" + ] + ], + "rewards": { + "recipes": [ + "nuggetmod:nugget_spear" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_sword.json b/src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_sword.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/combat/nugget_sword.json rename to src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_sword.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_block.json b/src/main/resources/data/nuggetmod/advancement/recipes/decorations/nugget_block.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_block.json rename to src/main/resources/data/nuggetmod/advancement/recipes/decorations/nugget_block.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json diff --git a/src/generated/resources/data/minecraft/advancement/recipes/misc/nugget_armor_trim_smithing_template_smithing_trim.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json similarity index 78% rename from src/generated/resources/data/minecraft/advancement/recipes/misc/nugget_armor_trim_smithing_template_smithing_trim.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json index 9337957..ea31719 100644 --- a/src/generated/resources/data/minecraft/advancement/recipes/misc/nugget_armor_trim_smithing_template_smithing_trim.json +++ b/src/main/resources/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:nugget_armor_trim_smithing_template_smithing_trim" + "recipe": "nuggetmod:nugget_smithing_template" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "minecraft:nugget_armor_trim_smithing_template_smithing_trim" + "nuggetmod:nugget_smithing_template" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json b/src/main/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json rename to src/main/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_axe.json b/src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_axe.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_axe.json rename to src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_axe.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json b/src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json rename to src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json b/src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json rename to src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json diff --git a/src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json b/src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json similarity index 100% rename from src/generated/resources/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json rename to src/main/resources/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json diff --git a/src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_block.json b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_block.json similarity index 84% rename from src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_block.json rename to src/main/resources/data/nuggetmod/loot_table/blocks/nugget_block.json index f6f83c8..570a52f 100644 --- a/src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_block.json +++ b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_block.json @@ -16,6 +16,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "nuggetmod:blocks/nugget_block" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json similarity index 96% rename from src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json rename to src/main/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json index 889f1ba..2c6cb7b 100644 --- a/src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json +++ b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json @@ -56,6 +56,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "nuggetmod:blocks/nugget_deepslate_ore" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json similarity index 95% rename from src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json rename to src/main/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json index e4fa0c2..233dd6c 100644 --- a/src/generated/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json +++ b/src/main/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json @@ -47,6 +47,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "nuggetmod:blocks/nugget_ore" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json b/src/main/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json similarity index 84% rename from src/generated/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json rename to src/main/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json index 6e93a66..aa65af3 100644 --- a/src/generated/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json +++ b/src/main/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json @@ -16,6 +16,5 @@ ], "rolls": 1.0 } - ], - "random_sequence": "nuggetmod:blocks/raw_nugget_block" + ] } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget.json b/src/main/resources/data/nuggetmod/recipe/nugget.json similarity index 85% rename from src/generated/resources/data/nuggetmod/recipe/nugget.json rename to src/main/resources/data/nuggetmod/recipe/nugget.json index 45b5382..5af506b 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shapeless", - "category": "misc", + "category": "building", "ingredients": [ "nuggetmod:nugget_block" ], diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_axe.json b/src/main/resources/data/nuggetmod/recipe/nugget_axe.json similarity index 65% rename from src/generated/resources/data/nuggetmod/recipe/nugget_axe.json rename to src/main/resources/data/nuggetmod/recipe/nugget_axe.json index 428b032..6b435ef 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_axe.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_axe.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget", - "B": "minecraft:stick" + "N": "nuggetmod:nugget", + "S": "minecraft:stick" }, "pattern": [ - " AA", - " BA", - " B " + " NN", + " SN", + " S " ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_block.json b/src/main/resources/data/nuggetmod/recipe/nugget_block.json similarity index 73% rename from src/generated/resources/data/nuggetmod/recipe/nugget_block.json rename to src/main/resources/data/nuggetmod/recipe/nugget_block.json index 06b296c..c114a80 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_block.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_block.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": "nuggetmod:nugget" + "#": "nuggetmod:nugget" }, "pattern": [ - "AAA", - "AAA", - "AAA" + "###", + "###", + "###" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_boots.json b/src/main/resources/data/nuggetmod/recipe/nugget_boots.json similarity index 73% rename from src/generated/resources/data/nuggetmod/recipe/nugget_boots.json rename to src/main/resources/data/nuggetmod/recipe/nugget_boots.json index eacb9ad..e642165 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_boots.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_boots.json @@ -2,12 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget" + "N": "nuggetmod:nugget" }, "pattern": [ - " ", - "A A", - "A A" + "N N", + "N N" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_chestplate.json b/src/main/resources/data/nuggetmod/recipe/nugget_chestplate.json similarity index 74% rename from src/generated/resources/data/nuggetmod/recipe/nugget_chestplate.json rename to src/main/resources/data/nuggetmod/recipe/nugget_chestplate.json index 06467be..0014c2f 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_chestplate.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_chestplate.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget" + "N": "nuggetmod:nugget" }, "pattern": [ - "A A", - "AAA", - "AAA" + "N N", + "NNN", + "NNN" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json rename to src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json rename to src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json rename to src/main/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json rename to src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json rename to src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json b/src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json rename to src/main/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_helmet.json b/src/main/resources/data/nuggetmod/recipe/nugget_helmet.json similarity index 74% rename from src/generated/resources/data/nuggetmod/recipe/nugget_helmet.json rename to src/main/resources/data/nuggetmod/recipe/nugget_helmet.json index b5098cb..ad30ac6 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_helmet.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_helmet.json @@ -2,12 +2,11 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget" + "N": "nuggetmod:nugget" }, "pattern": [ - "AAA", - "A A", - " " + "NNN", + "N N" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_hoe.json b/src/main/resources/data/nuggetmod/recipe/nugget_hoe.json similarity index 65% rename from src/generated/resources/data/nuggetmod/recipe/nugget_hoe.json rename to src/main/resources/data/nuggetmod/recipe/nugget_hoe.json index 92eb2de..bca91c6 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_hoe.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_hoe.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget", - "B": "minecraft:stick" + "N": "nuggetmod:nugget", + "S": "minecraft:stick" }, "pattern": [ - " AA", - " B ", - " B " + " NN", + " S ", + " S " ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_leggings.json b/src/main/resources/data/nuggetmod/recipe/nugget_leggings.json similarity index 74% rename from src/generated/resources/data/nuggetmod/recipe/nugget_leggings.json rename to src/main/resources/data/nuggetmod/recipe/nugget_leggings.json index 2de367f..aeee302 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_leggings.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_leggings.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget" + "N": "nuggetmod:nugget" }, "pattern": [ - "AAA", - "A A", - "A A" + "NNN", + "N N", + "N N" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_pickaxe.json b/src/main/resources/data/nuggetmod/recipe/nugget_pickaxe.json similarity index 66% rename from src/generated/resources/data/nuggetmod/recipe/nugget_pickaxe.json rename to src/main/resources/data/nuggetmod/recipe/nugget_pickaxe.json index ad24d76..907a76a 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_pickaxe.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_pickaxe.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget", - "B": "minecraft:stick" + "N": "nuggetmod:nugget", + "S": "minecraft:stick" }, "pattern": [ - "AAA", - " B ", - " B " + "NNN", + " S ", + " S " ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_shovel.json b/src/main/resources/data/nuggetmod/recipe/nugget_shovel.json similarity index 66% rename from src/generated/resources/data/nuggetmod/recipe/nugget_shovel.json rename to src/main/resources/data/nuggetmod/recipe/nugget_shovel.json index c8aab3a..988d1ba 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_shovel.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_shovel.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget", - "B": "minecraft:stick" + "N": "nuggetmod:nugget", + "S": "minecraft:stick" }, "pattern": [ - " A ", - " B ", - " B " + " N ", + " S ", + " S " ], "result": { "count": 1, diff --git a/src/generated/resources/data/minecraft/recipe/nugget_armor_trim_smithing_template_smithing_trim.json b/src/main/resources/data/nuggetmod/recipe/nugget_smithing_template.json similarity index 84% rename from src/generated/resources/data/minecraft/recipe/nugget_armor_trim_smithing_template_smithing_trim.json rename to src/main/resources/data/nuggetmod/recipe/nugget_smithing_template.json index 4620978..a9f30d3 100644 --- a/src/generated/resources/data/minecraft/recipe/nugget_armor_trim_smithing_template_smithing_trim.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_smithing_template.json @@ -2,5 +2,6 @@ "type": "minecraft:smithing_trim", "addition": "#minecraft:trim_materials", "base": "#minecraft:trimmable_armor", + "pattern": "nuggetmod:nugget", "template": "nuggetmod:nugget_armor_trim_smithing_template" } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/recipe/nugget_spear.json b/src/main/resources/data/nuggetmod/recipe/nugget_spear.json new file mode 100644 index 0000000..5324642 --- /dev/null +++ b/src/main/resources/data/nuggetmod/recipe/nugget_spear.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "key": { + "N": "nuggetmod:nugget", + "S": "minecraft:stick" + }, + "pattern": [ + " N", + " S ", + "S " + ], + "result": { + "count": 1, + "id": "nuggetmod:nugget_spear" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/recipe/nugget_sword.json b/src/main/resources/data/nuggetmod/recipe/nugget_sword.json similarity index 66% rename from src/generated/resources/data/nuggetmod/recipe/nugget_sword.json rename to src/main/resources/data/nuggetmod/recipe/nugget_sword.json index d381395..bd444f7 100644 --- a/src/generated/resources/data/nuggetmod/recipe/nugget_sword.json +++ b/src/main/resources/data/nuggetmod/recipe/nugget_sword.json @@ -2,13 +2,13 @@ "type": "minecraft:crafting_shaped", "category": "equipment", "key": { - "A": "nuggetmod:nugget", - "B": "minecraft:stick" + "N": "nuggetmod:nugget", + "S": "minecraft:stick" }, "pattern": [ - " A ", - " A ", - " B " + " N ", + " N ", + " S " ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/recipe/raw_nugget.json b/src/main/resources/data/nuggetmod/recipe/raw_nugget.json similarity index 100% rename from src/generated/resources/data/nuggetmod/recipe/raw_nugget.json rename to src/main/resources/data/nuggetmod/recipe/raw_nugget.json diff --git a/src/generated/resources/data/nuggetmod/recipe/raw_nugget_block.json b/src/main/resources/data/nuggetmod/recipe/raw_nugget_block.json similarity index 72% rename from src/generated/resources/data/nuggetmod/recipe/raw_nugget_block.json rename to src/main/resources/data/nuggetmod/recipe/raw_nugget_block.json index 9e650b2..1d63934 100644 --- a/src/generated/resources/data/nuggetmod/recipe/raw_nugget_block.json +++ b/src/main/resources/data/nuggetmod/recipe/raw_nugget_block.json @@ -2,12 +2,12 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": "nuggetmod:raw_nugget" + "R": "nuggetmod:raw_nugget" }, "pattern": [ - "AAA", - "AAA", - "AAA" + "RRR", + "RRR", + "RRR" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json b/src/main/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json similarity index 99% rename from src/generated/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json rename to src/main/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json index 2f81f37..7d3859a 100644 --- a/src/generated/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json +++ b/src/main/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json @@ -1,8 +1,8 @@ { - "remove": [ - "#nuggetmod:needs_nugget_tool" - ], "values": [ "#minecraft:incorrect_for_diamond_tool" + ], + "remove": [ + "#nuggetmod:needs_nugget_tool" ] } \ No newline at end of file diff --git a/src/main/resources/data/nuggetmod/tags/block/needs_nugget_tool.json b/src/main/resources/data/nuggetmod/tags/block/needs_nugget_tool.json new file mode 100644 index 0000000..46bea5a --- /dev/null +++ b/src/main/resources/data/nuggetmod/tags/block/needs_nugget_tool.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#minecraft:needs_diamond_tool", + "nuggetmod:nugget_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/trim_materials.json b/src/main/resources/data/nuggetmod/tags/item/nugget_tool_materials.json similarity index 93% rename from src/generated/resources/data/minecraft/tags/item/trim_materials.json rename to src/main/resources/data/nuggetmod/tags/item/nugget_tool_materials.json index 26e7bb0..317257f 100644 --- a/src/generated/resources/data/minecraft/tags/item/trim_materials.json +++ b/src/main/resources/data/nuggetmod/tags/item/nugget_tool_materials.json @@ -2,4 +2,5 @@ "values": [ "nuggetmod:nugget" ] -} \ No newline at end of file +} + diff --git a/src/generated/resources/data/nuggetmod/tags/item/nugget_repairs.json b/src/main/resources/data/nuggetmod/tags/item/repairs_nugget_armor.json similarity index 93% rename from src/generated/resources/data/nuggetmod/tags/item/nugget_repairs.json rename to src/main/resources/data/nuggetmod/tags/item/repairs_nugget_armor.json index 26e7bb0..317257f 100644 --- a/src/generated/resources/data/nuggetmod/tags/item/nugget_repairs.json +++ b/src/main/resources/data/nuggetmod/tags/item/repairs_nugget_armor.json @@ -2,4 +2,5 @@ "values": [ "nuggetmod:nugget" ] -} \ No newline at end of file +} + diff --git a/src/generated/resources/data/nuggetmod/trim_material/nugget.json b/src/main/resources/data/nuggetmod/trim_material/nugget.json similarity index 64% rename from src/generated/resources/data/nuggetmod/trim_material/nugget.json rename to src/main/resources/data/nuggetmod/trim_material/nugget.json index dfccef5..6816edb 100644 --- a/src/generated/resources/data/nuggetmod/trim_material/nugget.json +++ b/src/main/resources/data/nuggetmod/trim_material/nugget.json @@ -3,7 +3,5 @@ "description": { "color": "#F9B042", "translate": "trim_material.nuggetmod.nugget" - }, - "ingredient": "nuggetmod:nugget", - "item_model_index": 0.1 + } } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/trim_pattern/nugget.json b/src/main/resources/data/nuggetmod/trim_pattern/nugget.json similarity index 62% rename from src/generated/resources/data/nuggetmod/trim_pattern/nugget.json rename to src/main/resources/data/nuggetmod/trim_pattern/nugget.json index 8615bcc..1e6469d 100644 --- a/src/generated/resources/data/nuggetmod/trim_pattern/nugget.json +++ b/src/main/resources/data/nuggetmod/trim_pattern/nugget.json @@ -3,6 +3,5 @@ "decal": false, "description": { "translate": "trim_pattern.nuggetmod.nugget" - }, - "template_item": "nuggetmod:nugget_armor_trim_smithing_template" + } } \ No newline at end of file diff --git a/src/generated/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json b/src/main/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json similarity index 97% rename from src/generated/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json rename to src/main/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json index c175612..443d7c2 100644 --- a/src/generated/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json +++ b/src/main/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 9, + "size": 12, "targets": [ { "state": { diff --git a/src/generated/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json b/src/main/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json similarity index 95% rename from src/generated/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json rename to src/main/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json index 6d610a5..540d7ba 100644 --- a/src/generated/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json +++ b/src/main/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 12 + "count": 14 }, { "type": "minecraft:in_square" diff --git a/src/main/resources/icon.png b/src/main/resources/icon.png new file mode 100644 index 0000000..fe2ea3c Binary files /dev/null and b/src/main/resources/icon.png differ