angel/forge-nugget
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Update to 1.21.3

Browse Source 
- updated lang files
This commit is contained in:
angel
2025-01-05 21:32:58 -06:00
parent 3f48a686cc
commit a53a6cd654
67 changed files with 1020 additions and 838 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/generated/resources/.cache/0f01e36c8c3e714f07da00bbe50a17425fd9bc5d
View File

@@ -1,5 +1,6 @@
// 1.21 2024-12-31T12:23:21.3743193 Tags for minecraft:item mod id nuggetmod
// 1.21.3 2025-01-05T20:56:27.110625 Tags for minecraft:item mod id nuggetmod
4dd3e16112d5950861571bb8b5212983e5192dfc data/minecraft/tags/item/trimmable_armor.json
bb7be5aa0b582860d2d8dd7a0f2115ac4dc842a9 data/minecraft/tags/item/trim_materials.json
ab6bd31a8063a99913c4a6fc41bde37ff0564389 data/minecraft/tags/item/trim_templates.json
bb7be5aa0b582860d2d8dd7a0f2115ac4dc842a9 data/nuggetmod/tags/item/nugget_repairs.json
562be55fb606ffa455100bd2a6942846dcd124cb data/nuggetmod/tags/item/transformable_items.json

2
src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
View File

@@ -1,4 +1,4 @@
// 1.21 2025-01-04T16:52:56.0700567 Registries
// 1.21.3 2025-01-05T20:56:27.1418921 Registries
53aea7bfe12c9e17903617fdc8946ce53057c9da data/nuggetmod/forge/biome_modifier/add_nugget_ore.json
12edbe7dddaf2b8379bdf3bc1f3552c83a86e3b2 data/nuggetmod/trim_material/nugget.json
c26c02f523d403aa4352b30b1a97a95a69a4d97c data/nuggetmod/trim_pattern/nugget.json

2
src/generated/resources/.cache/2a6e80b4e4362196170dd4ee2a3d8e7f56f9a0a0
View File

@@ -1,4 +1,4 @@
// 1.21 2024-12-30T18:01:57.8471253 Tags for minecraft:block mod id nuggetmod
// 1.21.3 2025-01-05T20:56:27.127889 Tags for minecraft:block mod id nuggetmod
265fffb09f55ddbd810e4aca08e95427b6f8abb8 data/minecraft/tags/block/mineable/pickaxe.json
d3afbade112106a4f7dba97fc08964398669700a data/minecraft/tags/block/needs_stone_tool.json
768d28c36c35fda7aa9d014ae9d9ce7ba23fdfb8 data/nuggetmod/tags/block/incorrect_for_nugget_tool.json

2
src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
View File

@@ -1,4 +1,4 @@
// 1.21 2024-12-30T14:50:30.7468819 Loot Tables
// 1.21.3 2025-01-05T20:56:27.127889 Loot Tables
74a43d938ccd280fff25bd66ec0f55a3e2c30ad0 data/nuggetmod/loot_table/blocks/nugget_block.json
206de236ad19cf2d06cf21b0f282e5b64bd5918d data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json
d65584c1286a06f15f88db5682372d78e8e0ebf7 data/nuggetmod/loot_table/blocks/nugget_ore.json

2
src/generated/resources/.cache/670693f4e9f75e384665a60f155b7d94dfc51f73
View File

@@ -1,4 +1,4 @@
// 1.21 2025-01-04T11:42:26.2312156 Item Models: nuggetmod
// 1.21.3 2025-01-05T20:56:27.110625 Item Models: nuggetmod
90b22d61432e35fb68e2232a3eb76e15d2a77d89 assets/nuggetmod/models/item/nugget.json
b8f9c1135f1af8d77201d51866966ba73f3dbbfc assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json
cac221f8a7659366628c3b429c22ebd27f5adadd assets/nuggetmod/models/item/nugget_axe.json

2
src/generated/resources/.cache/8273965882b13bc067ed62dddc852c7100e3fe85
View File

@@ -1,4 +1,4 @@
// 1.21 2024-12-30T14:50:30.7438816 Block States: nuggetmod
// 1.21.3 2025-01-05T20:56:27.127889 Block States: nuggetmod
e458b67af79198beb28149bb003b81fd70269977 assets/nuggetmod/blockstates/nugget_block.json
878193901a69171263432147c8d69dc3ad6a3329 assets/nuggetmod/blockstates/nugget_deepslate_ore.json
97b7f829a5952c457a7bd71a23fd2e40c9e41afd assets/nuggetmod/blockstates/nugget_ore.json

44
src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View File

@@ -1,4 +1,6 @@
// 1.21 2024-12-31T12:23:21.3783193 Recipes
// 1.21.3 2025-01-05T20:56:27.127889 Recipes
0fd5b77716dc45e332dc36b7f60aed900e725668 data/minecraft/advancement/recipes/misc/nugget_armor_trim_smithing_template_smithing_trim.json
eee047ea671dd65353f1d8da201bc2436d4df8ce data/minecraft/recipe/nugget_armor_trim_smithing_template_smithing_trim.json
1c4efbad060c0d91ce6e6c1cb6d1d1669bbcc6b4 data/nuggetmod/advancement/recipes/combat/nugget_boots.json
588a665982f97f016a8945b507f6a03d310f4090 data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json
63d4a98bae280da5308f5011f4dce19970e727f9 data/nuggetmod/advancement/recipes/combat/nugget_helmet.json
@@ -12,30 +14,28 @@ e10188670de3a7a815f73a66fc5f4e92a648b51e data/nuggetmod/advancement/recipes/misc
16fc56222bdb61afa3618038ee189f405fd20922 data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json
7b9dcb92c1af9c1982292c1efd6b4fb27513b3f5 data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json
762af010e4f2c6dbf4b54f5f7c4575f28b47c524 data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json
3a29497bf8969610a531ac0779bb7267c1bf640d data/nuggetmod/advancement/recipes/misc/nugget_trim_mat.json
59e41b4b30c51f225ccb673f401839ec7e77fe20 data/nuggetmod/advancement/recipes/misc/raw_nugget.json
0eac4876a225ba434ebefcecb2d9a3d5b1af5cc3 data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json
a159ddd57f6c263d4862f5ee479f3df3595379d9 data/nuggetmod/advancement/recipes/tools/nugget_axe.json
1889633531251f9d32df839f13041a7839569079 data/nuggetmod/advancement/recipes/tools/nugget_hoe.json
e6dbb4576802c7009518fe2bc4dbe541f16b6687 data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json
f63988753316f6848707a1bebb9004bff2f6d5e4 data/nuggetmod/advancement/recipes/tools/nugget_shovel.json
46cf496588958f9727af31d89b8adfa56f319b32 data/nuggetmod/recipe/nugget.json
7a93996e567af4358d0add13412438c89efff405 data/nuggetmod/recipe/nugget_axe.json
a616003c555df86443a939fff05be631f005b5e7 data/nuggetmod/recipe/nugget_block.json
fba3a92aeef3bcf65889af3b55ad40623ad3cf47 data/nuggetmod/recipe/nugget_boots.json
f1ce7b37a945d5c3efa7ce7f60a58e039a04c56f data/nuggetmod/recipe/nugget_chestplate.json
7cb0715c46c01f7dd8802b3cd8302c20ccb281cf data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json
662c0a68d691fcb004fdfa4b18af745502eb51c4 data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json
67a9834245f8ecd74cf7b72ebeddee9e9d2296a5 data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json
61bc79a197aa3f00ccdbc3a573c1dc90bbb380e1 data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json
da4d3a890cd2a10ef6502861f80d89da01c38533 data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json
b7053163e6e237928a9de0b5dfe921883a6e6b5c data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json
4811b9e729ce87ef07a6ee8efd587ae5ed8b70f1 data/nuggetmod/recipe/nugget_helmet.json
5502215f2426567d06785639a9011f601e9593a4 data/nuggetmod/recipe/nugget_hoe.json
3600ae6233a94b7a07d3c4a130a00ade2015811e data/nuggetmod/recipe/nugget_leggings.json
b983b6efee4952a3a2dee230c8f13b363894d29e data/nuggetmod/recipe/nugget_pickaxe.json
2c25036d787f791caa37836de3c04b31ab9e9551 data/nuggetmod/recipe/nugget_shovel.json
af124114b7882426d847851db6f2f1c8bba4e6eb data/nuggetmod/recipe/nugget_sword.json
89b44ca1e8e6540d7c1f61341e16258fcffeed6c data/nuggetmod/recipe/nugget_trim_mat.json
c30c2ad83bc1c296f619a1d111eb11aff1155f0b data/nuggetmod/recipe/raw_nugget.json
0a4297bae4d63ee5ba5092d4000e888112186293 data/nuggetmod/recipe/raw_nugget_block.json
f18984bdec26f4f333b5ec20dcd09fe9dac918d5 data/nuggetmod/recipe/nugget.json
c7c3acba2cdae39001c97944e1a1eae52005bd21 data/nuggetmod/recipe/nugget_axe.json
aa4ff76dcf9a17b5d90446ef62241e4c7361e4a9 data/nuggetmod/recipe/nugget_block.json
4b405f3dad7ae6b25cf1d2eddfc27ddbe1ce19f6 data/nuggetmod/recipe/nugget_boots.json
b3ce51675061ff49c9b94b9f8d15dc87dcf9d089 data/nuggetmod/recipe/nugget_chestplate.json
be70886b617dbe8cdcb814a4d2f754fe3abbc659 data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json
45cac40fe007c51d5b6e1d197c395975d2655def data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json
5c3110d1dd220a719fc151cc9067a4a53ee690c5 data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json
c21c2f595a958d26505b7615307edc354d890505 data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json
33c1f170f1bb2e409858a4953b957abf9c3de9a1 data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json
731c7b164832de8e43bf6e9f900026a43ce5ee1a data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json
421bd212f8c4995d52f9818aa393a18003442ffc data/nuggetmod/recipe/nugget_helmet.json
c833522c310026665d6aa35a7d356f977e08b500 data/nuggetmod/recipe/nugget_hoe.json
10dbf3cb9b95e5bf98b10b7f2c68c24fb6fe0404 data/nuggetmod/recipe/nugget_leggings.json
dc1605410ae247b2a5ee0f94c3914b3c8a6f01a2 data/nuggetmod/recipe/nugget_pickaxe.json
9ef92db13ca907ab529a954bf53fe21e2fdd65c3 data/nuggetmod/recipe/nugget_shovel.json
9a9aa6724cc4ccc22c3cf0f7fb52b59e91e47215 data/nuggetmod/recipe/nugget_sword.json
4788404672bb103c1ac8572be4e1d17db06c31c1 data/nuggetmod/recipe/raw_nugget.json
73fcf373c40d2d9c3e8e5d6ccacbac0f4a2efa55 data/nuggetmod/recipe/raw_nugget_block.json

4
src/generated/resources/data/nuggetmod/advancement/recipes/misc/nugget_trim_mat.json → src/generated/resources/data/minecraft/advancement/recipes/misc/nugget_armor_trim_smithing_template_smithing_trim.json
View File

@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "nuggetmod:nugget_trim_mat"
"recipe": "minecraft:nugget_armor_trim_smithing_template_smithing_trim"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"nuggetmod:nugget_trim_mat"
"minecraft:nugget_armor_trim_smithing_template_smithing_trim"
]
}
}

6
src/generated/resources/data/minecraft/recipe/nugget_armor_trim_smithing_template_smithing_trim.json Normal file
View File

@@ -0,0 +1,6 @@
{
"type": "minecraft:smithing_trim",
"addition": "#minecraft:trim_materials",
"base": "#minecraft:trimmable_armor",
"template": "nuggetmod:nugget_armor_trim_smithing_template"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "nuggetmod:nugget_block"
}
"nuggetmod:nugget_block"
],
"result": {
"count": 9,

8
src/generated/resources/data/nuggetmod/recipe/nugget_axe.json
View File

@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
},
"B": {
"item": "minecraft:stick"
}
"A": "nuggetmod:nugget",
"B": "minecraft:stick"
},
"pattern": [
" AA",

4
src/generated/resources/data/nuggetmod/recipe/nugget_block.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"A": {
"item": "nuggetmod:nugget"
}
"A": "nuggetmod:nugget"
},
"pattern": [
"AAA",

4
src/generated/resources/data/nuggetmod/recipe/nugget_boots.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
}
"A": "nuggetmod:nugget"
},
"pattern": [
" ",

4
src/generated/resources/data/nuggetmod/recipe/nugget_chestplate.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
}
"A": "nuggetmod:nugget"
},
"pattern": [
"A A",

4
src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json
View File

@@ -4,9 +4,7 @@
"cookingtime": 100,
"experience": 0.25,
"group": "nugget",
"ingredient": {
"item": "nuggetmod:nugget_deepslate_ore"
},
"ingredient": "nuggetmod:nugget_deepslate_ore",
"result": {
"id": "nuggetmod:nugget"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json
View File

@@ -4,9 +4,7 @@
"cookingtime": 100,
"experience": 0.25,
"group": "nugget",
"ingredient": {
"item": "nuggetmod:nugget_ore"
},
"ingredient": "nuggetmod:nugget_ore",
"result": {
"id": "nuggetmod:nugget"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json
View File

@@ -4,9 +4,7 @@
"cookingtime": 100,
"experience": 0.25,
"group": "nugget",
"ingredient": {
"item": "nuggetmod:raw_nugget"
},
"ingredient": "nuggetmod:raw_nugget",
"result": {
"id": "nuggetmod:nugget"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json
View File

@@ -4,9 +4,7 @@
"cookingtime": 200,
"experience": 0.25,
"group": "nugget",
"ingredient": {
"item": "nuggetmod:nugget_deepslate_ore"
},
"ingredient": "nuggetmod:nugget_deepslate_ore",
"result": {
"id": "nuggetmod:nugget"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json
View File

@@ -4,9 +4,7 @@
"cookingtime": 200,
"experience": 0.25,
"group": "nugget",
"ingredient": {
"item": "nuggetmod:nugget_ore"
},
"ingredient": "nuggetmod:nugget_ore",
"result": {
"id": "nuggetmod:nugget"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json
View File

@@ -4,9 +4,7 @@
"cookingtime": 200,
"experience": 0.25,
"group": "nugget",
"ingredient": {
"item": "nuggetmod:raw_nugget"
},
"ingredient": "nuggetmod:raw_nugget",
"result": {
"id": "nuggetmod:nugget"
}

4
src/generated/resources/data/nuggetmod/recipe/nugget_helmet.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
}
"A": "nuggetmod:nugget"
},
"pattern": [
"AAA",

8
src/generated/resources/data/nuggetmod/recipe/nugget_hoe.json
View File

@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
},
"B": {
"item": "minecraft:stick"
}
"A": "nuggetmod:nugget",
"B": "minecraft:stick"
},
"pattern": [
" AA",

4
src/generated/resources/data/nuggetmod/recipe/nugget_leggings.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
}
"A": "nuggetmod:nugget"
},
"pattern": [
"AAA",

8
src/generated/resources/data/nuggetmod/recipe/nugget_pickaxe.json
View File

@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
},
"B": {
"item": "minecraft:stick"
}
"A": "nuggetmod:nugget",
"B": "minecraft:stick"
},
"pattern": [
"AAA",

8
src/generated/resources/data/nuggetmod/recipe/nugget_shovel.json
View File

@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
},
"B": {
"item": "minecraft:stick"
}
"A": "nuggetmod:nugget",
"B": "minecraft:stick"
},
"pattern": [
" A ",

8
src/generated/resources/data/nuggetmod/recipe/nugget_sword.json
View File

@@ -2,12 +2,8 @@
"type": "minecraft:crafting_shaped",
"category": "equipment",
"key": {
"A": {
"item": "nuggetmod:nugget"
},
"B": {
"item": "minecraft:stick"
}
"A": "nuggetmod:nugget",
"B": "minecraft:stick"
},
"pattern": [
" A ",

12
src/generated/resources/data/nuggetmod/recipe/nugget_trim_mat.json
View File

@@ -1,12 +0,0 @@
{
"type": "minecraft:smithing_trim",
"addition": {
"tag": "minecraft:trim_materials"
},
"base": {
"tag": "minecraft:trimmable_armor"
},
"template": {
"item": "nuggetmod:nugget_armor_trim_smithing_template"
}
}

4
src/generated/resources/data/nuggetmod/recipe/raw_nugget.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shapeless",
"category": "misc",
"ingredients": [
{
"item": "nuggetmod:raw_nugget_block"
}
"nuggetmod:raw_nugget_block"
],
"result": {
"count": 9,

4
src/generated/resources/data/nuggetmod/recipe/raw_nugget_block.json
View File

@@ -2,9 +2,7 @@
"type": "minecraft:crafting_shaped",
"category": "misc",
"key": {
"A": {
"item": "nuggetmod:raw_nugget"
}
"A": "nuggetmod:raw_nugget"
},
"pattern": [
"AAA",

5
src/generated/resources/data/nuggetmod/tags/item/nugget_repairs.json Normal file
View File

@@ -0,0 +1,5 @@
{
"values": [
"nuggetmod:nugget"
]
}

16
src/main/java/xyz/sillyangel/nugget/block/ModBlocks.java
View File

@@ -1,5 +1,8 @@
package xyz.sillyangel.nugget.block;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import xyz.sillyangel.nugget.NuggetMod;
import xyz.sillyangel.nugget.item.ModItems;
import net.minecraft.util.valueproviders.UniformInt;
@@ -22,28 +25,33 @@ public class ModBlocks {
public static final RegistryObject<Block> NUGGET_BLOCK = registerBlock("nugget_block",
() -> new Block(BlockBehaviour.Properties.of()
.setId(ResourceKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_block")))
.strength(4f).requiresCorrectToolForDrops().sound(SoundType.AMETHYST)));
public static final RegistryObject<Block> RAW_NUGGET_BLOCK = registerBlock("raw_nugget_block",
() -> new Block(BlockBehaviour.Properties.of()
.setId(ResourceKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "raw_nugget_block")))
.strength(3f).requiresCorrectToolForDrops()));
// ores
public static final RegistryObject<Block> NUGGET_ORE = registerBlock("nugget_ore",
() -> new DropExperienceBlock(UniformInt.of(2, 4), BlockBehaviour.Properties.of()
.setId(ResourceKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_ore")))
.strength(4f).requiresCorrectToolForDrops()));
public static final RegistryObject<Block> NUGGET_DEEPSLATE_ORE = registerBlock("nugget_deepslate_ore",
() -> new DropExperienceBlock(UniformInt.of(2, 4), BlockBehaviour.Properties.of()
.setId(ResourceKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_deepslate_ore")))
.strength(5f).requiresCorrectToolForDrops().sound(SoundType.DEEPSLATE)));
private static <T extends Block> RegistryObject<T> registerBlock(String name, Supplier<T> block) {
RegistryObject<T> toReturn = BLOCKS.register(name, block);
registerBlockItem(name, toReturn);
private static <T extends Block> RegistryObject<T> registerBlock(String name, Supplier<T> block) {
RegistryObject<T> toReturn = BLOCKS.register(name, block);
registerBlockItem(name, toReturn);
return toReturn;
}
private static <T extends Block> void registerBlockItem(String name, RegistryObject<T> block) {
ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()));
ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, name)))));
}
public static void register(IEventBus eventBus) {

2
src/main/java/xyz/sillyangel/nugget/datagen/DataGenerators.java
View File

@@ -27,7 +27,7 @@ public class DataGenerators {
generator.addProvider(event.includeServer(), new LootTableProvider(packOutput, Collections.emptySet(),
List.of(new LootTableProvider.SubProviderEntry(ModBlockLootTableProvider::new, LootContextParamSets.BLOCK)), lookupProvider));
generator.addProvider(event.includeServer(), new ModRecipeProvider(packOutput, lookupProvider));
generator.addProvider(event.includeServer(), new ModRecipeProvider.Runner(packOutput, lookupProvider));
BlockTagsProvider blockTagsProvider = new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper);
generator.addProvider(event.includeServer(), blockTagsProvider);

24
src/main/java/xyz/sillyangel/nugget/datagen/ModItemModelProvider.java
View File

@@ -1,5 +1,7 @@
package xyz.sillyangel.nugget.datagen;
import net.minecraft.world.item.equipment.trim.TrimMaterial;
import net.minecraft.world.item.equipment.trim.TrimMaterials;
import xyz.sillyangel.nugget.NuggetMod;
import xyz.sillyangel.nugget.item.ModItems;
import net.minecraft.data.PackOutput;
@@ -11,8 +13,6 @@ import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import net.minecraft.world.item.armortrim.TrimMaterial;
import net.minecraft.world.item.armortrim.TrimMaterials;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.packs.PackType;
import net.minecraft.world.item.ArmorItem;
@@ -63,13 +63,19 @@ public class ModItemModelProvider extends ItemModelProvider {
if (itemRegistryObject.get() instanceof ArmorItem armorItem) {
trimMaterials.forEach((trimMaterial, value) -> {
float trimValue = value;
String armorType = switch (armorItem.getEquipmentSlot()) {
case HEAD -> "helmet";
case CHEST -> "chestplate";
case LEGS -> "leggings";
case FEET -> "boots";
default -> "";
};
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";

2
src/main/java/xyz/sillyangel/nugget/datagen/ModItemTagProvider.java
View File

@@ -38,5 +38,7 @@ public class ModItemTagProvider extends ItemTagsProvider {
.add(ModItems.NUGGET.get());
tag(ItemTags.TRIM_TEMPLATES)
.add(ModItems.NUGGET_SMITHING_TEMPLATE.get());
tag(ModTags.Items.NUGGET_REPAIRS)
.add(ModItems.NUGGET.get());
}
}

90
src/main/java/xyz/sillyangel/nugget/datagen/ModRecipeProvider.java
View File

@@ -1,5 +1,7 @@
package xyz.sillyangel.nugget.datagen;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.item.Items;
import xyz.sillyangel.nugget.NuggetMod;
import xyz.sillyangel.nugget.block.ModBlocks;
@@ -16,134 +18,152 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
public class ModRecipeProvider extends RecipeProvider implements IConditionBuilder {
public ModRecipeProvider(PackOutput pOutput, CompletableFuture<HolderLookup.Provider> pRegistries) {
super(pOutput, pRegistries);
public ModRecipeProvider(HolderLookup.Provider lookup, RecipeOutput recipeOutput) {
super(lookup, recipeOutput);
}
public static class Runner extends RecipeProvider.Runner {
public Runner(PackOutput output, CompletableFuture<HolderLookup.Provider> 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(RecipeOutput pRecipeOutput) {
protected void buildRecipes() {
List<ItemLike> NUGGET_SMELTABLES = List.of(ModItems.RAW_NUGGET.get(),
ModBlocks.NUGGET_ORE.get(), ModBlocks.NUGGET_DEEPSLATE_ORE.get());
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.NUGGET_BLOCK.get())
shaped(RecipeCategory.MISC, ModBlocks.NUGGET_BLOCK.get())
.pattern("AAA")
.pattern("AAA")
.pattern("AAA")
.define('A', ModItems.NUGGET.get())
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.NUGGET.get(), 9)
shapeless(RecipeCategory.MISC, ModItems.NUGGET.get(), 9)
.requires(ModBlocks.NUGGET_BLOCK.get())
.unlockedBy(getHasName(ModBlocks.NUGGET_BLOCK.get()), has(ModBlocks.NUGGET_BLOCK.get())).save(pRecipeOutput);
.unlockedBy(getHasName(ModBlocks.NUGGET_BLOCK.get()), has(ModBlocks.NUGGET_BLOCK.get())).save(this.output);
// RAW NUGGET
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.RAW_NUGGET_BLOCK.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.RAW_NUGGET.get()), has(ModItems.RAW_NUGGET.get())).save(this.output);
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.RAW_NUGGET.get(), 9)
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(pRecipeOutput);
.unlockedBy(getHasName(ModBlocks.RAW_NUGGET_BLOCK.get()), has(ModBlocks.RAW_NUGGET_BLOCK.get())).save(this.output);
// TOOLS
//SWORD
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ModItems.NUGGET_SWORD.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//PICAXE
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.NUGGET_PICKAXE.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//AXE
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.NUGGET_AXE.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//SHOVEL
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.NUGGET_SHOVEL.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//HOE
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.NUGGET_HOE.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
// END OF TOOLS
// start of armor
// head!?!
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ModItems.NUGGET_HELMET.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//shirt
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ModItems.NUGGET_CHESTPLATE.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//pants?
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ModItems.NUGGET_LEGGINGS.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
//socks
ShapedRecipeBuilder.shaped(RecipeCategory.COMBAT, ModItems.NUGGET_BOOTS.get())
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(pRecipeOutput);
.unlockedBy(getHasName(ModItems.NUGGET.get()), has(ModItems.NUGGET.get())).save(this.output);
trimSmithing(pRecipeOutput, ModItems.NUGGET_SMITHING_TEMPLATE.get(), ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_trim_mat"));
trimSmithing(ModItems.NUGGET_SMITHING_TEMPLATE.get(), ResourceKey.create(Registries.RECIPE,
ResourceLocation.parse(getItemName(ModItems.NUGGET_SMITHING_TEMPLATE.get()) + "_smithing_trim")));
oreSmelting(pRecipeOutput, NUGGET_SMELTABLES, RecipeCategory.MISC, ModItems.NUGGET.get(), 0.25f, 200, "nugget");
oreBlasting(pRecipeOutput, NUGGET_SMELTABLES, RecipeCategory.MISC, ModItems.NUGGET.get(), 0.25f, 100, "nugget");
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 static void oreSmelting(RecipeOutput recipeOutput, List<ItemLike> pIngredients, RecipeCategory pCategory, ItemLike pResult,
protected void oreSmelting(RecipeOutput recipeOutput, List<ItemLike> pIngredients, RecipeCategory pCategory, ItemLike pResult,
float pExperience, int pCookingTIme, String pGroup) {
oreCooking(recipeOutput, RecipeSerializer.SMELTING_RECIPE, SmeltingRecipe::new, pIngredients, pCategory, pResult,
pExperience, pCookingTIme, pGroup, "_from_smelting");
}
protected static void oreBlasting(RecipeOutput recipeOutput, List<ItemLike> pIngredients, RecipeCategory pCategory, ItemLike pResult,
protected void oreBlasting(RecipeOutput recipeOutput, List<ItemLike> pIngredients, RecipeCategory pCategory, ItemLike pResult,
float pExperience, int pCookingTime, String pGroup) {
oreCooking(recipeOutput, RecipeSerializer.BLASTING_RECIPE, BlastingRecipe::new, pIngredients, pCategory, pResult,
pExperience, pCookingTime, pGroup, "_from_blasting");
}
protected static <T extends AbstractCookingRecipe> void oreCooking(RecipeOutput recipeOutput, RecipeSerializer<T> pCookingSerializer, AbstractCookingRecipe.Factory<T> factory,
protected <T extends AbstractCookingRecipe> void oreCooking(RecipeOutput recipeOutput, RecipeSerializer<T> pCookingSerializer, AbstractCookingRecipe.Factory<T> factory,
List<ItemLike> 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))

46
src/main/java/xyz/sillyangel/nugget/item/ModArmorMaterials.java
View File

@@ -1,46 +1,22 @@
package xyz.sillyangel.nugget.item;
import xyz.sillyangel.nugget.NuggetMod;
import xyz.sillyangel.nugget.util.ModTags;
import net.minecraft.Util;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterial;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.equipment.ArmorMaterial;
import net.minecraft.world.item.equipment.ArmorType;
import java.util.EnumMap;
import java.util.List;
import java.util.function.Supplier;
public class ModArmorMaterials {
public static final Holder<ArmorMaterial> NUGGET_ARMOR_MATERIAL = register("nugget", Util.make(new EnumMap<>(ArmorItem.Type.class),
public static final ArmorMaterial NUGGET_ARMOR_MATERIAL = new ArmorMaterial(1200, Util.make(new EnumMap<>(ArmorType.class),
attribute -> {
attribute.put(ArmorItem.Type.BOOTS, 5);
attribute.put(ArmorItem.Type.LEGGINGS, 7);
attribute.put(ArmorItem.Type.CHESTPLATE, 9);
attribute.put(ArmorItem.Type.HELMET, 5);
attribute.put(ArmorItem.Type.BODY, 11);
}), 20, 4.5f, 0.5f, () -> ModItems.NUGGET.get());
private static Holder<ArmorMaterial> register(String name, EnumMap<ArmorItem.Type, Integer> typeProtection,
int enchantability, float toughness, float knockbackResistance,
Supplier<Item> ingredientItem) {
ResourceLocation location = ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, name);
Holder<SoundEvent> equipSound = SoundEvents.ARMOR_EQUIP_NETHERITE;
Supplier<Ingredient> ingredient = () -> Ingredient.of(ingredientItem.get());
List<ArmorMaterial.Layer> layers = List.of(new ArmorMaterial.Layer(location));
EnumMap<ArmorItem.Type, Integer> typeMap = new EnumMap<>(ArmorItem.Type.class);
for (ArmorItem.Type type : ArmorItem.Type.values()) {
typeMap.put(type, typeProtection.get(type));
}
return Registry.registerForHolder(BuiltInRegistries.ARMOR_MATERIAL, location,
new ArmorMaterial(typeProtection, enchantability, equipSound, ingredient, layers, toughness, knockbackResistance));
}
attribute.put(ArmorType.BOOTS, 5);
attribute.put(ArmorType.LEGGINGS, 7);
attribute.put(ArmorType.CHESTPLATE, 9);
attribute.put(ArmorType.HELMET, 5);
attribute.put(ArmorType.BODY, 11);
}), 15, SoundEvents.ARMOR_EQUIP_NETHERITE,
4f, 0.1f, ModTags.Items.NUGGET_REPAIRS, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget"));
}

68
src/main/java/xyz/sillyangel/nugget/item/ModItems.java
View File

@@ -1,5 +1,8 @@
package xyz.sillyangel.nugget.item;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.item.equipment.ArmorType;
import xyz.sillyangel.nugget.NuggetMod;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
@@ -17,7 +20,8 @@ public class ModItems {
DeferredRegister.create(ForgeRegistries.ITEMS, NuggetMod.MOD_ID);
public static final RegistryObject<Item> NUGGET = ITEMS.register("nugget",
() -> new Item(new Item.Properties().food(ModFoodProperties.Nugget)) {
() -> new Item(new Item.Properties().setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget")))
.food(ModFoodProperties.Nugget)) {
@Override
public void appendHoverText(ItemStack pStack, TooltipContext pContext, List<Component> pTooltipComponent, TooltipFlag pTooltipFlag) {
pTooltipComponent.add(Component.translatable("item.nuggetmod.nugget.tooltip"));
@@ -26,48 +30,64 @@ public class ModItems {
});
public static final RegistryObject<Item> RAW_NUGGET = ITEMS.register("raw_nugget",
() -> new Item(new Item.Properties()));
() -> new Item(new Item.Properties().setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "raw_nugget")))));
public static final RegistryObject<Item> NUGGET_SWORD = ITEMS.register("nugget_sword",
() -> new SwordItem(ModToolTiers.NUGGET, new Item.Properties()
.attributes(SwordItem.createAttributes(ModToolTiers.NUGGET, 3, -2.4f))));
() -> new SwordItem(ModToolTiers.NUGGET, 3, -2.4f, new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_sword")))));
public static final RegistryObject<Item> NUGGET_PICKAXE = ITEMS.register("nugget_pickaxe",
() -> new PickaxeItem(ModToolTiers.NUGGET, new Item.Properties()
.attributes(PickaxeItem.createAttributes(ModToolTiers.NUGGET, 1, -2.8f))));
() -> new PickaxeItem(ModToolTiers.NUGGET, 1, -2.8f, new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_pickaxe")))));
public static final RegistryObject<Item> NUGGET_SHOVEL = ITEMS.register("nugget_shovel",
() -> new ShovelItem(ModToolTiers.NUGGET, new Item.Properties()
.attributes(ShovelItem.createAttributes(ModToolTiers.NUGGET, 1.5f, -3.0f))));
() -> new ShovelItem(ModToolTiers.NUGGET, 1.5f, -3.0f, new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_shovel")))));
public static final RegistryObject<Item> NUGGET_AXE = ITEMS.register("nugget_axe",
() -> new AxeItem(ModToolTiers.NUGGET, new Item.Properties()
.attributes(AxeItem.createAttributes(ModToolTiers.NUGGET, 6, -3.2f))));
() -> new AxeItem(ModToolTiers.NUGGET, 6, -3.2f, new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_axe")))));
public static final RegistryObject<Item> NUGGET_HOE = ITEMS.register("nugget_hoe",
() -> new HoeItem(ModToolTiers.NUGGET, new Item.Properties()
.attributes(HoeItem.createAttributes(ModToolTiers.NUGGET, 0, -3.0f))));
() -> new HoeItem(ModToolTiers.NUGGET, 0, -3.0f, new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_hoe")))));
// armor things
public static final RegistryObject<Item> NUGGET_HELMET = ITEMS.register("nugget_helmet",
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorItem.Type.HELMET,
new Item.Properties().durability(ArmorItem.Type.HELMET.getDurability(25))));
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorType.HELMET,
new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_helmet")))));
public static final RegistryObject<Item> NUGGET_CHESTPLATE = ITEMS.register("nugget_chestplate",
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE,
new Item.Properties().durability(ArmorItem.Type.CHESTPLATE.getDurability(25))));
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorType.CHESTPLATE,
new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_chestplate")))));
public static final RegistryObject<Item> NUGGET_LEGGINGS = ITEMS.register("nugget_leggings",
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS,
new Item.Properties().durability(ArmorItem.Type.LEGGINGS.getDurability(25))));
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorType.LEGGINGS,
new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_leggings")))));
public static final RegistryObject<Item> NUGGET_BOOTS = ITEMS.register("nugget_boots",
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorItem.Type.BOOTS,
new Item.Properties().durability(ArmorItem.Type.BOOTS.getDurability(25))));
() -> new ArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, ArmorType.BOOTS,
new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_boots")))));
// horse armor
public static final RegistryObject<Item> NUGGET_HORSE_ARMOR = ITEMS.register("nugget_horse_armor",
() -> new AnimalArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, AnimalArmorItem.BodyType.EQUESTRIAN,
false, new Item.Properties().stacksTo(1)));
() -> new AnimalArmorItem(ModArmorMaterials.NUGGET_ARMOR_MATERIAL, AnimalArmorItem.BodyType.EQUESTRIAN, new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_horse_armor")))
.stacksTo(1)));
// smithing temp
public static final RegistryObject<Item> NUGGET_SMITHING_TEMPLATE = ITEMS.register("nugget_armor_trim_smithing_template",
() -> SmithingTemplateItem.createArmorTrimTemplate(ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_trim_mat")));
() -> SmithingTemplateItem.createArmorTrimTemplate(new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_armor_trim_smithing_template")))));
public static final RegistryObject<Item> NUGGET_MUSIC_DISC = ITEMS.register("nugget_music_disc",
() -> new Item(new Item.Properties().jukeboxPlayable(ModSounds.NUGGET_THEME_KEY).stacksTo(1)));
() -> new Item(new Item.Properties()
.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, "nugget_music_disc")))
.jukeboxPlayable(ModSounds.NUGGET_THEME_KEY).stacksTo(1)));
public static void register(IEventBus eventBus) {

9
src/main/java/xyz/sillyangel/nugget/item/ModToolTiers.java
View File

@@ -1,12 +1,9 @@
package xyz.sillyangel.nugget.item;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraftforge.common.ForgeTier;
import net.minecraft.world.item.ToolMaterial;
import xyz.sillyangel.nugget.util.ModTags;
public class ModToolTiers {
public static final Tier NUGGET = new ForgeTier(1500, 4.5f, 3.5f, 22,
ModTags.Blocks.NEEDS_NUGGET_TOOL, () -> Ingredient.of(ModItems.NUGGET.get()),
ModTags.Blocks.INCORRECT_FOR_NUGGET_TOOL);
public static final ToolMaterial NUGGET = new ToolMaterial(ModTags.Blocks.INCORRECT_FOR_NUGGET_TOOL,
1500, 4.5f, 3.5f, 22, ModTags.Items.NUGGET_REPAIRS);
}

2
src/main/java/xyz/sillyangel/nugget/trim/ModTrimMaterials.java
View File

@@ -11,7 +11,7 @@ import net.minecraft.network.chat.TextColor;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.armortrim.TrimMaterial;
import net.minecraft.world.item.equipment.trim.TrimMaterial;
import java.util.Map;

2
src/main/java/xyz/sillyangel/nugget/trim/ModTrimPatterns.java
View File

@@ -1,5 +1,6 @@
package xyz.sillyangel.nugget.trim;
import net.minecraft.world.item.equipment.trim.TrimPattern;
import xyz.sillyangel.nugget.NuggetMod;
import xyz.sillyangel.nugget.item.ModItems;
import net.minecraft.Util;
@@ -9,7 +10,6 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.armortrim.TrimPattern;
import net.minecraftforge.registries.ForgeRegistries;
public class ModTrimPatterns {

2
src/main/java/xyz/sillyangel/nugget/util/ModItemProperites.java
View File

@@ -1,5 +1,5 @@
package xyz.sillyangel.nugget.util;
public class ModItemProperites {
// i dont know what to put here?!
}

1
src/main/java/xyz/sillyangel/nugget/util/ModTags.java
View File

@@ -20,6 +20,7 @@ public class ModTags {
public static class Items {
public static final TagKey<Item> TRANSFORMABLE_ITEMS = createTag("transformable_items");
public static final TagKey<Item> NUGGET_REPAIRS = createTag("nugget_repairs");
private static TagKey<Item> createTag(String name) {
return ItemTags.create(ResourceLocation.fromNamespaceAndPath(NuggetMod.MOD_ID, name));

125
src/main/resources/assets/minecraft/atlases/armor_trims.json
View File

@@ -1,63 +1,66 @@
{
"replace": false,
"sources": [
{
"type": "paletted_permutations",
"textures": [
"trims/models/armor/coast",
"trims/models/armor/coast_leggings",
"trims/models/armor/sentry",
"trims/models/armor/sentry_leggings",
"trims/models/armor/dune",
"trims/models/armor/dune_leggings",
"trims/models/armor/wild",
"trims/models/armor/wild_leggings",
"trims/models/armor/ward",
"trims/models/armor/ward_leggings",
"trims/models/armor/eye",
"trims/models/armor/eye_leggings",
"trims/models/armor/vex",
"trims/models/armor/vex_leggings",
"trims/models/armor/tide",
"trims/models/armor/tide_leggings",
"trims/models/armor/snout",
"trims/models/armor/snout_leggings",
"trims/models/armor/rib",
"trims/models/armor/rib_leggings",
"trims/models/armor/spire",
"trims/models/armor/spire_leggings",
"trims/models/armor/wayfinder",
"trims/models/armor/wayfinder_leggings",
"trims/models/armor/shaper",
"trims/models/armor/shaper_leggings",
"trims/models/armor/silence",
"trims/models/armor/silence_leggings",
"trims/models/armor/raiser",
"trims/models/armor/raiser_leggings",
"trims/models/armor/host",
"trims/models/armor/host_leggings",
"nuggetmod:trims/models/armor/nugget",
"nuggetmod:trims/models/armor/nugget_leggings"
],
"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",
"diamond_darker": "trims/color_palettes/diamond_darker",
"netherite_darker": "trims/color_palettes/netherite_darker",
"nugget": "nuggetmod:trims/color_palettes/nugget"
}
"replace": false,
"sources": [
{
"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/wild",
"trims/entity/humanoid_leggings/wild",
"trims/entity/humanoid/ward",
"trims/entity/humanoid_leggings/ward",
"trims/entity/humanoid/eye",
"trims/entity/humanoid_leggings/eye",
"trims/entity/humanoid/vex",
"trims/entity/humanoid_leggings/vex",
"trims/entity/humanoid/tide",
"trims/entity/humanoid_leggings/tide",
"trims/entity/humanoid/snout",
"trims/entity/humanoid_leggings/snout",
"trims/entity/humanoid/rib",
"trims/entity/humanoid_leggings/rib",
"trims/entity/humanoid/spire",
"trims/entity/humanoid_leggings/spire",
"trims/entity/humanoid/wayfinder",
"trims/entity/humanoid_leggings/wayfinder",
"trims/entity/humanoid/shaper",
"trims/entity/humanoid_leggings/shaper",
"trims/entity/humanoid/silence",
"trims/entity/humanoid_leggings/silence",
"trims/entity/humanoid/raiser",
"trims/entity/humanoid_leggings/raiser",
"trims/entity/humanoid/host",
"trims/entity/humanoid_leggings/host",
"trims/entity/humanoid/flow",
"trims/entity/humanoid_leggings/flow",
"trims/entity/humanoid/bolt",
"trims/entity/humanoid_leggings/bolt",
"nuggetmod:trims/entity/humanoid/nugget",
"nuggetmod:trims/entity/humanoid_leggings/nugget"
],
"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",
"diamond_darker": "trims/color_palettes/diamond_darker",
"netherite_darker": "trims/color_palettes/netherite_darker",
"nugget": "nuggetmod:trims/color_palettes/nugget"
}
]
}
}
]
}

18
src/main/resources/assets/nuggetmod/lang/en_us.json
View File

@@ -1,11 +1,11 @@
{
"item.nuggetmod.raw_nugget": "Raw Nugget",
"item.nuggetmod.nugget": "nugget",
"item.nuggetmod.nugget": "Nugget",
"block.nuggetmod.nugget_block": "Nugget Block",
"block.nuggetmod.raw_nugget_block": "Raw Nugget Block",
"block.nuggetmod.nugget_ore": "Nugget Ore",
"block.nuggetmod.nugget_deepslate_ore": "Nugget Deepslate Ore",
"item.nuggetmod.nugget_block": "Nugget Block",
"item.nuggetmod.raw_nugget_block": "Raw Nugget Block",
"item.nuggetmod.nugget_ore": "Nugget Ore",
"item.nuggetmod.nugget_deepslate_ore": "Nugget Deepslate Ore",
"item.nuggetmod.nugget_sword": "Nugget Sword",
"item.nuggetmod.nugget_pickaxe": "Nugget Pickaxe",
@@ -18,21 +18,21 @@
"item.nuggetmod.nugget_horse_armor": "Nugget Horse Armor",
"item.nuggetmod.nugget_armor_trim_smithing_template": "Nugget Trim Template",
"item.nuggetmod.nugget_helmet": "Nugget Helmet",
"item.nuggetmod.nugget_chestplate": "Nugget Chestplate",
"item.nuggetmod.nugget_leggings": "Nugget Leggings",
"item.nuggetmod.nugget_boots": "Nugget Boots",
"creativetab.nuggetmod.nugget_items": "Nugget Mod Items",
"creativetab.nuggetmod.nugget_blocks": "Nugget Mod Blocks",
"creativetab.nuggetmod.nugget_items": "Nugget Items",
"creativetab.nuggetmod.nugget_blocks": "Nugget Blocks",
"item.nuggetmod.nugget.tooltip": "THE NUGGET",
"item.nuggetmod.nugget_armor_trim_smithing_template": "Nugget Armor Trim",
"trim_material.nuggetmod.nugget": "Nugget Material",
"trim_pattern.nuggetmod.nugget_trim_material": "Nugget Trim",
"trim_pattern.nuggetmod.nugget": "Nugget Trim",
"painting.nuggetmod.nugget_painting.title": "Nugget Painting",

40
src/main/resources/assets/nuggetmod/lang/es_mx.json
View File

@@ -1,30 +1,38 @@
{
"item.nuggetmod.raw_nugget": "Nugget Crudo",
"item.nuggetmod.nugget": "Nugget",
"block.nuggetmod.nugget_block": "Bloque de Nuggets",
"block.nuggetmod.raw_nugget_block": "Bloque de Nuggets Crudos",
"block.nuggetmod.nugget_ore": "Mineral de Nuggets",
"block.nuggetmod.nugget_deepslate_ore": "Mineral de Nuggets de Pizca Profunda",
"item.nuggetmod.nugget_block": "Bloque de Nuggets",
"item.nuggetmod.raw_nugget_block": "Bloque de Nuggets Crudos",
"item.nuggetmod.nugget_ore": "Mineral de Nuggets",
"item.nuggetmod.nugget_deepslate_ore": "Mineral de Nuggets de Pizca Profunda",
"item.nuggetmod.nugget_sword": "Espada de Nuggets",
"item.nuggetmod.nugget_pickaxe": "Pico de Nuggets",
"item.nuggetmod.nugget_shovel": "Pala de Nuggets",
"item.nuggetmod.nugget_axe": "Hacha de Nuggets",
"item.nuggetmod.nugget_hoe": "Azada de Nuggets",
"item.nuggetmod.nugget_music_disc": "Tema de Nuggets",
"item.nuggetmod.nugget_music_disc.desc": "Gegagedigedagedago",
"item.nuggetmod.nugget_horse_armor": "Armadura de Caballo de Nuggets",
"item.nuggetmod.nugget_armor_trim_smithing_template": "Plantilla de Adorno de Nuggets",
"item.nuggetmod.nugget_helmet": "Casco de Nuggets",
"item.nuggetmod.nugget_chestplate": "Peto de Nuggets",
"item.nuggetmod.nugget_leggings": "Leotardos de Nuggets",
"item.nuggetmod.nugget_boots": "Botas de Nuggets",
"creativetab.nuggetmod.nugget_items": "Artículos del Mod de Nuggets",
"creativetab.nuggetmod.nugget_blocks": "Bloques del Mod de Nuggets",
"creativetab.nuggetmod.nugget_items": "Artículos de Nuggets",
"creativetab.nuggetmod.nugget_blocks": "Bloques de Nuggets",
"item.nuggetmod.nugget.tooltip": "EL NUGGET",
"trim_pattern.nuggetmod.nugget_armor_trim_smithing_template": "Adorno de Armadura de Nuggets",
"trim_material.nuggetmod.nugget": "Material de Nuggets"
}
"trim_material.nuggetmod.nugget": "Material de Nuggets",
"trim_pattern.nuggetmod.nugget_trim_material": "Adorno de Nuggets",
"trim_pattern.nuggetmod.nugget": "Adorno de Nuggets",
"painting.nuggetmod.nugget_painting.title": "Pintura de Nuggets",
"painting.nuggetmod.nugget_painting.author": "Mod de Nuggets"
}

19
src/main/resources/assets/nuggetmod/models/equipment/nugget.json Normal file
View File

@@ -0,0 +1,19 @@
{
"layers": {
"horse_body": [
{
"texture": "nuggetmod:nugget"
}
],
"humanoid": [
{
"texture": "nuggetmod:nugget"
}
],
"humanoid_leggings": [
{
"texture": "nuggetmod:nugget"
}
]
}
}

0
src/main/resources/assets/nuggetmod/textures/entity/horse/armor/horse_armor_nugget.png → src/main/resources/assets/nuggetmod/textures/entity/equipment/horse_body/nugget.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 921 B

After

Width:  |  Height:  |  Size: 921 B

0
src/main/resources/assets/nuggetmod/textures/models/armor/nugget_layer_1.png → src/main/resources/assets/nuggetmod/textures/entity/equipment/humanoid/nugget.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
src/main/resources/assets/nuggetmod/textures/models/armor/nugget_layer_2.png → src/main/resources/assets/nuggetmod/textures/entity/equipment/humanoid_leggings/nugget.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
src/main/resources/assets/nuggetmod/textures/trims/models/armor/nugget.png → src/main/resources/assets/nuggetmod/textures/trims/entity/humanoid/nugget.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 584 B

After

Width:  |  Height:  |  Size: 584 B

0
src/main/resources/assets/nuggetmod/textures/trims/models/armor/nugget_leggings.png → src/main/resources/assets/nuggetmod/textures/trims/entity/humanoid_leggings/nugget.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 328 B