From e8df722ae78f1905c01f18301ce4aa2856732eb4 Mon Sep 17 00:00:00 2001 From: angel Date: Wed, 7 Jan 2026 19:56:40 -0600 Subject: [PATCH] stable forge 1.3.1+1.21.11 --- gradle.properties | 6 +- run-data/logs/debug.log | 10 +- .../nuggetmod/models/item/nugget_block.json | 3 - .../nuggetmod/models/item/nugget_boots.json | 68 ------- .../models/item/nugget_chestplate.json | 68 ------- .../models/item/nugget_deepslate_ore.json | 3 - .../nuggetmod/models/item/nugget_helmet.json | 68 ------- .../models/item/nugget_leggings.json | 68 ------- .../nuggetmod/models/item/nugget_ore.json | 3 - .../models/item/raw_nugget_block.json | 3 - .../tags/block/mineable/pickaxe.json | 8 - .../tags/block/needs_stone_tool.json | 6 - .../minecraft/tags/item/trim_templates.json | 5 - .../minecraft/tags/item/trimmable_armor.json | 8 - .../forge/biome_modifier/add_nugget_ore.json | 6 - .../tags/block/needs_nugget_tool.json | 6 - .../tags/item/transformable_items.json | 9 - .../nugget/datagen/DataGenerators.java | 41 ----- .../datagen/ModBlockLootTableProvider.java | 53 ------ .../nugget/datagen/ModBlockStateProvider.java | 29 --- .../nugget/datagen/ModBlockTagProvider.java | 41 ----- .../nugget/datagen/ModDatapackEntries.java | 31 ---- .../nugget/datagen/ModItemModelProvider.java | 134 -------------- .../nugget/datagen/ModItemTagProvider.java | 43 ----- .../nugget/datagen/ModRecipeProvider.java | 173 ------------------ .../nugget/trim/ModTrimMaterials.java | 31 ---- .../{nugget => nuggetmod}/Config.java | 7 +- .../{nugget => nuggetmod}/NuggetMod.java | 14 +- .../block/ModBlocks.java | 6 +- .../sillyangel/nuggetmod/event/ModEvents.java | 109 +++++++++++ .../item/ModArmorMaterials.java | 6 +- .../item/ModCreativeModeTabs.java | 7 +- .../item/ModFoodProperties.java | 2 +- .../{nugget => nuggetmod}/item/ModItems.java | 11 +- .../item/ModToolTiers.java | 4 +- .../sound/ModSounds.java | 4 +- .../nuggetmod/trim/ModTrimMaterials.java | 36 ++++ .../trim/ModTrimPatterns.java | 20 +- .../util/ModItemProperites.java | 2 +- .../{nugget => nuggetmod}/util/ModTags.java | 4 +- .../nuggetmod/villager/ModVillagers.java | 42 +++++ .../worldgen/ModBiomeModifiers.java | 4 +- .../worldgen/ModConfiguredFeatures.java | 6 +- .../worldgen/ModOrePlacement.java | 2 +- .../worldgen/ModPlacedFeatures.java | 4 +- src/main/resources/META-INF/mods.toml | 2 +- .../assets/minecraft/atlases/armor_trims.json | 31 ++-- .../nuggetmod/blockstates/nugget_block.json | 0 .../blockstates/nugget_deepslate_ore.json | 0 .../nuggetmod/blockstates/nugget_ore.json | 0 .../blockstates/raw_nugget_block.json | 0 .../{models => }/equipment/nugget.json | 5 + src/main/resources/assets/nuggetmod/icon.png | Bin 0 -> 9241 bytes .../assets/nuggetmod/items/nugget.json | 6 + .../nugget_armor_trim_smithing_template.json | 6 + .../assets/nuggetmod/items/nugget_axe.json | 6 + .../assets/nuggetmod/items/nugget_block.json | 6 + .../assets/nuggetmod/items/nugget_boots.json | 89 +++++++++ .../nuggetmod/items/nugget_chestplate.json | 89 +++++++++ .../nuggetmod/items/nugget_deepslate_ore.json | 6 + .../assets/nuggetmod/items/nugget_helmet.json | 89 +++++++++ .../assets/nuggetmod/items/nugget_hoe.json | 6 + .../nuggetmod/items/nugget_horse_armor.json | 6 + .../nuggetmod/items/nugget_leggings.json | 89 +++++++++ .../nuggetmod/items/nugget_music_disc.json | 6 + .../assets/nuggetmod/items/nugget_ore.json | 6 + .../nuggetmod/items/nugget_pickaxe.json | 6 + .../assets/nuggetmod/items/nugget_shovel.json | 6 + .../assets/nuggetmod/items/nugget_spear.json | 6 + .../assets/nuggetmod/items/nugget_sword.json | 6 + .../assets/nuggetmod/items/raw_nugget.json | 6 + .../nuggetmod/items/raw_nugget_block.json | 6 + .../assets/nuggetmod/lang/en_us.json | 88 +++++---- .../assets/nuggetmod/lang/es_mx.json | 10 +- .../nuggetmod/models/block/nugget_block.json | 0 .../models/block/nugget_deepslate_ore.json | 0 .../nuggetmod/models/block/nugget_ore.json | 0 .../models/block/raw_nugget_block.json | 0 .../assets/nuggetmod/models/item/nugget.json | 0 .../nugget_armor_trim_smithing_template.json | 0 .../nuggetmod/models/item/nugget_axe.json | 0 .../nuggetmod/models/item/nugget_boots.json | 6 + .../item/nugget_boots_amethyst_trim.json | 0 .../models/item/nugget_boots_copper_trim.json | 0 .../item/nugget_boots_diamond_trim.json | 0 .../item/nugget_boots_emerald_trim.json | 0 .../models/item/nugget_boots_gold_trim.json | 0 .../models/item/nugget_boots_iron_trim.json | 0 .../models/item/nugget_boots_lapis_trim.json | 0 .../item/nugget_boots_netherite_trim.json | 0 .../models/item/nugget_boots_quartz_trim.json | 0 .../item/nugget_boots_redstone_trim.json | 0 .../models/item/nugget_boots_resin_trim.json | 7 + .../models/item/nugget_chestplate.json | 6 + .../item/nugget_chestplate_amethyst_trim.json | 0 .../item/nugget_chestplate_copper_trim.json | 0 .../item/nugget_chestplate_diamond_trim.json | 0 .../item/nugget_chestplate_emerald_trim.json | 0 .../item/nugget_chestplate_gold_trim.json | 0 .../item/nugget_chestplate_iron_trim.json | 0 .../item/nugget_chestplate_lapis_trim.json | 0 .../nugget_chestplate_netherite_trim.json | 0 .../item/nugget_chestplate_quartz_trim.json | 0 .../item/nugget_chestplate_redstone_trim.json | 0 .../item/nugget_chestplate_resin_trim.json | 7 + .../nuggetmod/models/item/nugget_helmet.json | 6 + .../item/nugget_helmet_amethyst_trim.json | 0 .../item/nugget_helmet_copper_trim.json | 0 .../item/nugget_helmet_diamond_trim.json | 0 .../item/nugget_helmet_emerald_trim.json | 0 .../models/item/nugget_helmet_gold_trim.json | 0 .../models/item/nugget_helmet_iron_trim.json | 0 .../models/item/nugget_helmet_lapis_trim.json | 0 .../item/nugget_helmet_netherite_trim.json | 0 .../item/nugget_helmet_quartz_trim.json | 0 .../item/nugget_helmet_redstone_trim.json | 0 .../models/item/nugget_helmet_resin_trim.json | 7 + .../nuggetmod/models/item/nugget_hoe.json | 0 .../models/item/nugget_horse_armor.json | 0 .../models/item/nugget_leggings.json | 6 + .../item/nugget_leggings_amethyst_trim.json | 0 .../item/nugget_leggings_copper_trim.json | 0 .../item/nugget_leggings_diamond_trim.json | 0 .../item/nugget_leggings_emerald_trim.json | 0 .../item/nugget_leggings_gold_trim.json | 0 .../item/nugget_leggings_iron_trim.json | 0 .../item/nugget_leggings_lapis_trim.json | 0 .../item/nugget_leggings_netherite_trim.json | 0 .../item/nugget_leggings_quartz_trim.json | 0 .../item/nugget_leggings_redstone_trim.json | 0 .../item/nugget_leggings_resin_trim.json | 7 + .../models/item/nugget_music_disc.json | 0 .../nuggetmod/models/item/nugget_pickaxe.json | 0 .../nuggetmod/models/item/nugget_shovel.json | 0 .../nuggetmod/models/item/nugget_spear.json | 6 + .../nuggetmod/models/item/nugget_sword.json | 0 .../nuggetmod/models/item/raw_nugget.json | 0 .../nuggetmod/particles/nugget_particle.json | 5 + .../entity/equipment/horse_body/nugget.png | Bin 921 -> 2160 bytes .../entity/villager/profession/nuggeter.png | Bin 0 -> 4890 bytes .../nuggetmod/textures/item/nugget_spear.png | Bin 0 -> 4396 bytes .../textures/item/nugget_spear_in_hand.png | Bin 0 -> 4560 bytes .../nuggetmod/textures/particle/nugget.png | Bin 0 -> 9670 bytes .../data/minecraft/tags/item/axes.json | 6 - .../data/minecraft/tags/item/chest_armor.json | 6 - .../data/minecraft/tags/item/foot_armor.json | 6 - .../data/minecraft/tags/item/head_armor.json | 6 - .../data/minecraft/tags/item/hoes.json | 6 - .../data/minecraft/tags/item/leg_armor.json | 6 - .../data/minecraft/tags/item/pickaxes.json | 6 - .../data/minecraft/tags/item/shovels.json | 6 - .../data/minecraft/tags/item/swords.json | 6 - .../acquirable_job_site.json | 9 + .../recipes/building_blocks}/nugget.json | 0 .../recipes/combat/nugget_boots.json | 0 .../recipes/combat/nugget_chestplate.json | 0 .../recipes/combat/nugget_helmet.json | 0 .../recipes/combat/nugget_leggings.json | 0 .../recipes/combat/nugget_spear.json | 32 ++++ .../recipes/combat/nugget_sword.json | 0 .../recipes/decorations}/nugget_block.json | 0 ...et_from_blasting_nugget_deepslate_ore.json | 0 .../misc/nugget_from_blasting_nugget_ore.json | 0 .../misc/nugget_from_blasting_raw_nugget.json | 0 ...et_from_smelting_nugget_deepslate_ore.json | 0 .../misc/nugget_from_smelting_nugget_ore.json | 0 .../misc/nugget_from_smelting_raw_nugget.json | 0 .../misc/nugget_smithing_template.json} | 4 +- .../advancement/recipes/misc/raw_nugget.json | 0 .../recipes/misc/raw_nugget_block.json | 0 .../advancement/recipes/tools/nugget_axe.json | 0 .../advancement/recipes/tools/nugget_hoe.json | 0 .../recipes/tools/nugget_pickaxe.json | 0 .../recipes/tools/nugget_shovel.json | 0 .../loot_table/blocks/nugget_block.json | 3 +- .../blocks/nugget_deepslate_ore.json | 3 +- .../loot_table/blocks/nugget_ore.json | 3 +- .../loot_table/blocks/raw_nugget_block.json | 3 +- .../data/nuggetmod/recipe/nugget.json | 2 +- .../data/nuggetmod/recipe/nugget_axe.json | 10 +- .../data/nuggetmod/recipe/nugget_block.json | 8 +- .../data/nuggetmod/recipe/nugget_boots.json | 7 +- .../nuggetmod/recipe/nugget_chestplate.json | 8 +- ...et_from_blasting_nugget_deepslate_ore.json | 0 .../nugget_from_blasting_nugget_ore.json | 0 .../nugget_from_blasting_raw_nugget.json | 0 ...et_from_smelting_nugget_deepslate_ore.json | 0 .../nugget_from_smelting_nugget_ore.json | 0 .../nugget_from_smelting_raw_nugget.json | 0 .../data/nuggetmod/recipe/nugget_helmet.json | 7 +- .../data/nuggetmod/recipe/nugget_hoe.json | 10 +- .../nuggetmod/recipe/nugget_leggings.json | 8 +- .../data/nuggetmod/recipe/nugget_pickaxe.json | 10 +- .../data/nuggetmod/recipe/nugget_shovel.json | 10 +- .../recipe/nugget_smithing_template.json} | 1 + .../data/nuggetmod/recipe/nugget_spear.json | 17 ++ .../data/nuggetmod/recipe/nugget_sword.json | 10 +- .../data/nuggetmod/recipe/raw_nugget.json | 0 .../nuggetmod/recipe/raw_nugget_block.json | 8 +- .../tags/block/incorrect_for_nugget_tool.json | 6 +- .../tags/block/needs_nugget_tool.json | 6 + .../tags/item/nugget_tool_materials.json} | 3 +- .../tags/item/repairs_nugget_armor.json} | 3 +- .../data/nuggetmod/trim_material/nugget.json | 4 +- .../data/nuggetmod/trim_pattern/nugget.json | 3 +- .../configured_feature/nugget_ore.json | 2 +- .../placed_feature/nugget_ore_placed.json | 2 +- src/main/resources/icon.png | Bin 0 -> 9241 bytes 208 files changed, 964 insertions(+), 1151 deletions(-) delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_block.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_boots.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_chestplate.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_deepslate_ore.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_helmet.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_leggings.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/nugget_ore.json delete mode 100644 src/generated/resources/assets/nuggetmod/models/item/raw_nugget_block.json delete mode 100644 src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json delete mode 100644 src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json delete mode 100644 src/generated/resources/data/minecraft/tags/item/trim_templates.json delete mode 100644 src/generated/resources/data/minecraft/tags/item/trimmable_armor.json delete mode 100644 src/generated/resources/data/nuggetmod/forge/biome_modifier/add_nugget_ore.json delete mode 100644 src/generated/resources/data/nuggetmod/tags/block/needs_nugget_tool.json delete mode 100644 src/generated/resources/data/nuggetmod/tags/item/transformable_items.json delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/DataGenerators.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModBlockLootTableProvider.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModBlockStateProvider.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModBlockTagProvider.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModDatapackEntries.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModItemModelProvider.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModItemTagProvider.java delete mode 100644 src/main/java/dev/sillyangel/nugget/datagen/ModRecipeProvider.java delete mode 100644 src/main/java/dev/sillyangel/nugget/trim/ModTrimMaterials.java rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/Config.java (76%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/NuggetMod.java (87%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/block/ModBlocks.java (95%) create mode 100644 src/main/java/dev/sillyangel/nuggetmod/event/ModEvents.java rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/item/ModArmorMaterials.java (90%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/item/ModCreativeModeTabs.java (93%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/item/ModFoodProperties.java (85%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/item/ModItems.java (92%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/item/ModToolTiers.java (74%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/sound/ModSounds.java (93%) create mode 100644 src/main/java/dev/sillyangel/nuggetmod/trim/ModTrimMaterials.java rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/trim/ModTrimPatterns.java (61%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/util/ModItemProperites.java (65%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/util/ModTags.java (92%) create mode 100644 src/main/java/dev/sillyangel/nuggetmod/villager/ModVillagers.java rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/worldgen/ModBiomeModifiers.java (93%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/worldgen/ModConfiguredFeatures.java (94%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/worldgen/ModOrePlacement.java (94%) rename src/main/java/dev/sillyangel/{nugget => nuggetmod}/worldgen/ModPlacedFeatures.java (95%) rename src/{generated => main}/resources/assets/nuggetmod/blockstates/nugget_block.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/blockstates/nugget_deepslate_ore.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/blockstates/nugget_ore.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/blockstates/raw_nugget_block.json (100%) rename src/main/resources/assets/nuggetmod/{models => }/equipment/nugget.json (76%) create mode 100644 src/main/resources/assets/nuggetmod/icon.png create mode 100644 src/main/resources/assets/nuggetmod/items/nugget.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_axe.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_block.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_boots.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_chestplate.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_deepslate_ore.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_helmet.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_hoe.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_horse_armor.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_leggings.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_music_disc.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_ore.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_pickaxe.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_shovel.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_spear.json create mode 100644 src/main/resources/assets/nuggetmod/items/nugget_sword.json create mode 100644 src/main/resources/assets/nuggetmod/items/raw_nugget.json create mode 100644 src/main/resources/assets/nuggetmod/items/raw_nugget_block.json rename src/{generated => main}/resources/assets/nuggetmod/models/block/nugget_block.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/block/nugget_deepslate_ore.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/block/nugget_ore.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/block/raw_nugget_block.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_axe.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_boots.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_copper_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_gold_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_iron_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_boots_resin_trim.json create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_chestplate.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_helmet.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_hoe.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_horse_armor.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_leggings.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_music_disc.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_pickaxe.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_shovel.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/models/item/nugget_spear.json rename src/{generated => main}/resources/assets/nuggetmod/models/item/nugget_sword.json (100%) rename src/{generated => main}/resources/assets/nuggetmod/models/item/raw_nugget.json (100%) create mode 100644 src/main/resources/assets/nuggetmod/particles/nugget_particle.json create mode 100644 src/main/resources/assets/nuggetmod/textures/entity/villager/profession/nuggeter.png create mode 100644 src/main/resources/assets/nuggetmod/textures/item/nugget_spear.png create mode 100644 src/main/resources/assets/nuggetmod/textures/item/nugget_spear_in_hand.png create mode 100644 src/main/resources/assets/nuggetmod/textures/particle/nugget.png delete mode 100644 src/main/resources/data/minecraft/tags/item/axes.json delete mode 100644 src/main/resources/data/minecraft/tags/item/chest_armor.json delete mode 100644 src/main/resources/data/minecraft/tags/item/foot_armor.json delete mode 100644 src/main/resources/data/minecraft/tags/item/head_armor.json delete mode 100644 src/main/resources/data/minecraft/tags/item/hoes.json delete mode 100644 src/main/resources/data/minecraft/tags/item/leg_armor.json delete mode 100644 src/main/resources/data/minecraft/tags/item/pickaxes.json delete mode 100644 src/main/resources/data/minecraft/tags/item/shovels.json delete mode 100644 src/main/resources/data/minecraft/tags/item/swords.json create mode 100644 src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json rename src/{generated/resources/data/nuggetmod/advancement/recipes/misc => main/resources/data/nuggetmod/advancement/recipes/building_blocks}/nugget.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/combat/nugget_boots.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json (100%) create mode 100644 src/main/resources/data/nuggetmod/advancement/recipes/combat/nugget_spear.json rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/combat/nugget_sword.json (100%) rename src/{generated/resources/data/nuggetmod/advancement/recipes/misc => main/resources/data/nuggetmod/advancement/recipes/decorations}/nugget_block.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json (100%) rename src/{generated/resources/data/minecraft/advancement/recipes/misc/nugget_armor_trim_smithing_template_smithing_trim.json => main/resources/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json} (78%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/tools/nugget_axe.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json (100%) rename src/{generated => main}/resources/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json (100%) rename src/{generated => main}/resources/data/nuggetmod/loot_table/blocks/nugget_block.json (84%) rename src/{generated => main}/resources/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json (96%) rename src/{generated => main}/resources/data/nuggetmod/loot_table/blocks/nugget_ore.json (95%) rename src/{generated => main}/resources/data/nuggetmod/loot_table/blocks/raw_nugget_block.json (84%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget.json (85%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_axe.json (65%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_block.json (73%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_boots.json (73%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_chestplate.json (74%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_helmet.json (74%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_hoe.json (65%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_leggings.json (74%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_pickaxe.json (66%) rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_shovel.json (66%) rename src/{generated/resources/data/minecraft/recipe/nugget_armor_trim_smithing_template_smithing_trim.json => main/resources/data/nuggetmod/recipe/nugget_smithing_template.json} (84%) create mode 100644 src/main/resources/data/nuggetmod/recipe/nugget_spear.json rename src/{generated => main}/resources/data/nuggetmod/recipe/nugget_sword.json (66%) rename src/{generated => main}/resources/data/nuggetmod/recipe/raw_nugget.json (100%) rename src/{generated => main}/resources/data/nuggetmod/recipe/raw_nugget_block.json (72%) rename src/{generated => main}/resources/data/nuggetmod/tags/block/incorrect_for_nugget_tool.json (99%) create mode 100644 src/main/resources/data/nuggetmod/tags/block/needs_nugget_tool.json rename src/{generated/resources/data/minecraft/tags/item/trim_materials.json => main/resources/data/nuggetmod/tags/item/nugget_tool_materials.json} (93%) rename src/{generated/resources/data/nuggetmod/tags/item/nugget_repairs.json => main/resources/data/nuggetmod/tags/item/repairs_nugget_armor.json} (93%) rename src/{generated => main}/resources/data/nuggetmod/trim_material/nugget.json (64%) rename src/{generated => main}/resources/data/nuggetmod/trim_pattern/nugget.json (62%) rename src/{generated => main}/resources/data/nuggetmod/worldgen/configured_feature/nugget_ore.json (97%) rename src/{generated => main}/resources/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json (95%) create mode 100644 src/main/resources/icon.png 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 0000000000000000000000000000000000000000..fe2ea3c2e2f3f6bbfaa112e2dd09e543573bd455 GIT binary patch literal 9241 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 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 0000000000000000000000000000000000000000..83a6c17824038cef479ceb7fde3fab41257922fb GIT binary patch literal 4890 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..595cf2d58a9eec26532ae3564530e048930ecdbe GIT binary patch literal 4396 zcmeHKdsGzX6(6*)f{S8=fHswJJ+a0(JC7aMnGK5p7GZ;nE1*I|>+Hwdrc`|kbS`+aAp+?<{g8ZtEmf}l`isv!g1!{l>Z5V%Hn^f2I7UzC+CWiVdY<#t+y zd>)nxT|CVD1Sr&)UT-XQOBYU=clO#&#(aP2-iG$C$3H87dCmm#wWAyUv)R_#a`5RZXWs}3 z)>Y&w;kH?+o`fA+wjVlhSaXr=DCxe_^rI62e?xOZB7Qz?IRpii3Q0+3V^UIoE+B*I zH#eP3J7*4WSde){6`>fvp5pfI_~KpFvA@m^-<7yG;&l&J_*o<=q-Ny45O`zly6B2U zib&hCpX3H6JQ{m`?yJ?|%XXiCR+(6ljmEY7rsGTcgf|+#erf*UW0p0wcdWA~MQUy> z!XJf17h%85F>ux?Vr7+~vFq3#$G+pUu72M9*!J~)x*{Nc6ZNsOX=V#t(^40D<=Oe^ zi>nsh6Ys6stWNE|;Ayz8y%PAlz?vyU(+7q3!VYHVvG2c~bM1QBp0acMYBNu5{3`pO zCmM2IUXs&M(_M0=`qZIMJ+Hr)x?)n=MmRAc;>9Xv#%ssZ*O!FvXnf^KO73Zcx+M2S z%spr4n9xHH6+P=(4 z@lQwU9!(9D3EikDpe-0;g9ki7{a&R}!Bmq!zjP%%b!xwrC|wbE>)V zA#pw(Ah7ci1N-dx4pHaRtNgq=@GP5A73_ydEA^^ulNnBOx_OvXlWGh}_6Y@qDn0~` zb8}W*hGAYG1$fh|@+8TnLs75StM+QtPPYxkX_`hc0wo9pAP}+8Au&G0AxnC^7*_SKt(VsK5WVqqsctrAxmHr z>@L3-5PKL>60Cz_4U0`4@uxF15a2$*I}F{QyB`ctCX>$KWIb|tMuT1@&#&X0tib8~ zj~L5R1W9oSY1M!WN5vo%&X9=Kf?;&5MMG<7Y6z9lAxeyc!I$Ys%iWPq@Y+^2xR zZwI;PlH5EaIo(-KXTDw~hXl)>1H&e;oH#~e42;ABQjCbzVYm*9&B7@irq$sXf&t4A zypt2Gh5rjJFCI9qx8$jU2<9*Jn|fDNCcmopt@kxw@Gm78_Ad$@!}g{iG6g*6j}vh9 z4zYQR!^VT%qpw~2?ZWr80zvaMs2qi0e2m;uv<6``1cOkNRzvW#2J}L2{RY@Yr&aPY zZa%>VbOc&~_VjB7&+-@QrQxx7^LV)mKrjTufk^#=5q*N8eF>xTp3$Fi9Qqwi;{1Ri zn+)*lwSmnG?1kvSX4t10i1&v)`fBk*P65NClZ;5;QMpFt8j%7c0*`jrs9YmbU_{{2 z?)tyU6*Bla#XG>iATRh>+R!yi0v}pImb4TD)Fc0Pp4_t;Sb|-tIU)p&pDdpN(6;I* zU{pv(Q?lao00pE_?nuko1xz=LhJ-BY63fA3UkJ56naFA?-@Eq7#dXCAEmgaY?%G;h z!o95oM|-VO`HN%0$DsoYGfRsTG8D;T+ootGVvCB}I_}m6Q^(T>bMLnMLO)!7sowWR z*JS18hhGv{U3KwCH7la(;-2Sk&UAj_TD?lMxX}8>HvMHo&!sdMQFZ0-jrC6+YS-0< zja}d7TXt8N+0}Z+T*iF+%}aoRh3D(*>(`XM6_gn3t=->qW8?jA7r1Btn7aJg zw&p6KCBoU>x^V55xXTqMw_IrY6kuQ7WDN=mg6J_zqbEXT-5^ECn4E4nkho&)e*q|x BKb-&o literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..745b9115bbeff1ff9ce53783aa924124cc4cd6e0 GIT binary patch literal 4560 zcmeHKc~BHr8gE1xMIk5XcQ9n^>9~GwPn@jKYD7WyTAAQ ze((E!-}he4TceMU@%DPn3xXhTZLB5%++p@R$`kz31qGepcA_9Dg-O8du+?TUQaL2d z+esGn3_>N>Tb=`F;l0! zKglsOBsq9eovp>FD%wWyH>^yB~4uFNFAisM;B@Fc;0gJwZ&xCZtXF_`0ZgT4^$8LT37u zG>@oh~;bTL`*&}&)& zx*}CW7$?!2$~C8+*Y7azK04#voo}CJ{`85w)Gfj(J2|%fjVo~Vm4n``UCn`Sl_y`N zuP!d*#dd#@+j33X>aoS6dXlhxSN>JseJNS^$LmtRI$yG*q-po|#LqT9O1aU{lKSTb zsXtbCuRKxt+5R)R3%AB*jEma{tD*v?mt#S5j>fND>0fnf*3U6%jT+v{wCSiV^n(%J z`+wlPDE{uip~q!@ZzrHWOrxyz)I{G7kJlupo<-zUo*ez3zk2TN+}xPJF-BT~ zap*t2)6#0iKN0xC!fx)zSij$+y3b$>G2bR zzBBbt3Rc^n9zJ*PyXx<|mqM2sY;6&ptF)l)9297;6y00}ZZYvN!eStK4wDu19R!6( zI;6LKTG;BXsZR3vEL z?4z(e^a6MwJ=%|zz`lHP!R*Mm+1 ztCXKW(w1BsPDbaEW+rGb1%dbbTXStWu5<{TPv(#&0HwjKf+17JXm$F24_1Oq%4BtU z0kMZ58Ok^y){xlP5m!2c0|D;+yhG4^xx2ssrPC=i7Ce^?PpeUK+4&WO1*Zsw>rqZf zg;EhNLySU_K*X4lKnw&Lh7fWQii$B28D<~{QEAOIgPC!Xr2^zU3h>|pgIp>QVu(~M zk|SaR;E@@_M2J9cKrso1q7q@)Ac}c53UnowGdL=iiU3q{xqy@q1diZgQX?W3qY@Ae zK_Dbfh%gY1OhOVaDgsx$X|b6wP)^E(Ws-cWIny=33a*IKYn5Cf4;`@Rb1=pT9F*L- zlsVTiFpxx<$V3KX)f7m>q*5`s1QLNvB$W(+-Xd)@=tP!Nfbv8=*|23%fMkHM7~7|S zz~upQQK)Ss##n4g7E6wj%Z3EAp8dl*u$%~t!88~{0#Z~Mra%P>G%QIVQ=n3XK!%{e zG6-)WC}aNrLbHnp4(};>EJcI)^IfK%6_rRX?s@BZ&7oXN35H#ZLV@8uDbQG6ufl+< zX9&;2%$X$EJ$l=<&rbbLE69w-FqxRZ5Fv?65wS=pK`@b6j7S7HDFG(21jk$|^t00z zBV)&GWK<^55oiV4)1?(W!&Ru6L(%pulC1&|3_%4zq+Y><>@zDEzc*n%yJz%e9M1oZ zCgCo?piKt&_1M7X1@=OI|7O^$8Ho3fyn1W#M@|95!;`#}zQb}2%k@$UycBr2yN2a@ zDFt2%JltLXH@Un9j#H!={0p*!!_uGLUa}7yv^))QF&gLv`}yG5jxt~wZH-N(A!v*r z`*njVDklOXhtcYyId|MR5GUXn{0IZ*=>n}LDk-Ju#^%U4)%=O8Yl0Tcm>gYK6ns8I zRa~q{DZZ2*yzq{@rmW`pS-5Tb^O0xw-dLnjm-i7At8?P(3 zJg)M2aHOfJtDE;=+=aqm%c1<`vlmkVeqN_yGXA~GHZ!?63redgat1jMSA;~3oE@%pJ9eG^azt+kifx`H%&E*?rR&aVIJ z);g-(%lF;+OCEn1>|S;{#`#XR-rV%;xLSC%q_!oEZ^#_q1ll{o2C! z_)lJ~dVPi7ZJH YINQ!%SKbT?1%-jM(eawSs*Ixl0>dkg761SM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ab22a0afa23a1bc3da6e65ec13d30aec7433a187 GIT binary patch literal 9670 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 IM6N<$g0?N75&!@I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fe2ea3c2e2f3f6bbfaa112e2dd09e543573bd455 GIT binary patch literal 9241 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 v6Cd^c4$mHYJA3-g@1nm4jL^l8e$V&`