Skip to content

Commit

Permalink
added resonarium, armor, and tools
Browse files Browse the repository at this point in the history
  • Loading branch information
NewJumper committed Jun 24, 2024
1 parent cbf7eb5 commit a8cf4e5
Show file tree
Hide file tree
Showing 41 changed files with 165 additions and 41 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.1 2024-04-04T16:04:51.8042794 Item Models: deeperdarker
// 1.20.1 2024-06-17T14:29:08.1929221 Item Models: deeperdarker
b36185a1f9e1c105ef9ef404ee0483eedd9ecd79 assets/deeperdarker/models/item/ancient_vase.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/deeperdarker/models/item/angler_fish_spawn_egg.json
f2fe62e9aa1b817d10053a94259d530922d39562 assets/deeperdarker/models/item/blooming_moss_block.json
Expand Down Expand Up @@ -96,6 +96,16 @@ ceca42e3aadb0cadd907d918dfa0d3a88944f465 assets/deeperdarker/models/item/polishe
b3a17670ce04497d99b6b8ee3dda60ed1e330885 assets/deeperdarker/models/item/polished_sculk_stone_stairs.json
bdc3ad08e38c745a346717a9719044e0db544588 assets/deeperdarker/models/item/polished_sculk_stone_wall.json
8864938ba857d68c957e39e40fe9f7117f72e31e assets/deeperdarker/models/item/reinforced_echo_shard.json
898e24490c0414bee4afe3948a2737a56e32d1e7 assets/deeperdarker/models/item/resonarium.json
71024a2f8123c05a27ee21b5f5fb59a3a09ecf80 assets/deeperdarker/models/item/resonarium_axe.json
918f37e4eef3a3e99b7be8d427c3bf47a324e46f assets/deeperdarker/models/item/resonarium_boots.json
3a48ed1c333611fcdb30501672fac5161b64f19b assets/deeperdarker/models/item/resonarium_chestplate.json
9df928778ad73e9d6de7db6b22d0ed4d3b12a500 assets/deeperdarker/models/item/resonarium_helmet.json
5149734d531ed0c01d770df8e01548cf33f72fca assets/deeperdarker/models/item/resonarium_hoe.json
c2b39a118b3315f27e56bf0bed7d11dfca096297 assets/deeperdarker/models/item/resonarium_leggings.json
6b9906209e176d83260edda3108b7d15f342e449 assets/deeperdarker/models/item/resonarium_pickaxe.json
a4a65d437afaa5e174b2119c748ba99eb995ef3b assets/deeperdarker/models/item/resonarium_shovel.json
50a72ba3d144f141d159f832cbbcc419a6c25ece assets/deeperdarker/models/item/resonarium_sword.json
18121c23d9e0f562f3d6394f3f7930858df5c802 assets/deeperdarker/models/item/sculk_bone.json
63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/deeperdarker/models/item/sculk_centipede_spawn_egg.json
f59336e87979e26e0d145442c21358fd27e2dd22 assets/deeperdarker/models/item/sculk_gleam.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// 1.20.1 2023-12-03T14:33:13.0923737 Tags for minecraft:item mod id deeperdarker
// 1.20.1 2024-06-17T14:29:08.1772973 Tags for minecraft:item mod id deeperdarker
7d44281ae960cc3804e46c4d7ae2b88440d7a7cf data/deeperdarker/tags/items/bloom_stems.json
a84781beeff4cf18e5532d7e95fe62956c365027 data/deeperdarker/tags/items/dampens_vibrations.json
3254a070f3d679712b15610724ab74c5900e0204 data/deeperdarker/tags/items/echo_logs.json
a84781beeff4cf18e5532d7e95fe62956c365027 data/forge/tags/items/armors/boots.json
cd0c284256799e44917e495727d6befdd3b4515c data/forge/tags/items/armors/chestplates.json
7f61d04c47afdea03496a2ecf268e2a58e08514e data/forge/tags/items/armors/helmets.json
27cdfe38cacfb8862c0f8e357fb2d87ebe2c214a data/forge/tags/items/armors/leggings.json
8b122eeb8b60fbcbe24049d43d3235c9b324bb67 data/forge/tags/items/armors/boots.json
1eec4d64020f6c39dd18198ce2e63fa970059d3f data/forge/tags/items/armors/chestplates.json
c4b9a00d1f842ab62fc22c75515a5c0746dff69d data/forge/tags/items/armors/helmets.json
451cd1095452cd449c647f17647283aad60bbefc data/forge/tags/items/armors/leggings.json
9d236ad52ffab14efb6405a34d837dafff77e363 data/forge/tags/items/ores.json
ec4e45d46ce1593f9bb4b226a1e3d143bc0942c6 data/forge/tags/items/ores/coal.json
dc2be5311ef04baad7565936ffafc6dcea324cf1 data/forge/tags/items/ores/copper.json
Expand All @@ -16,7 +16,7 @@ a84d63160bb42d942778124d8368b9db10ef6ed2 data/forge/tags/items/ores/gold.json
e85880d9acf64424927082c80e9af7c9f50de52f data/forge/tags/items/ores/lapis.json
b87f41ec93385cf003a9e81713446620acd52b86 data/forge/tags/items/ores/redstone.json
d88fb43be0304b77c90c64f924fa2b46c4eeea4a data/forge/tags/items/stone.json
fdb484f4a210e2dd05f467df98f15fd1f3a73196 data/minecraft/tags/items/axes.json
743e0bd68d3bd18829be7dd9766c3d77d2e81061 data/minecraft/tags/items/axes.json
828ad83b431bb94c090ae2c19a590f9f05e876ea data/minecraft/tags/items/boats.json
228936f18b279028fc9028a3e9fd11dbc0674eab data/minecraft/tags/items/chest_boats.json
ec4e45d46ce1593f9bb4b226a1e3d143bc0942c6 data/minecraft/tags/items/coal_ores.json
Expand All @@ -26,19 +26,19 @@ dc2be5311ef04baad7565936ffafc6dcea324cf1 data/minecraft/tags/items/copper_ores.j
7dbce4cb80be16ec44f3472f112147a1d7ba8e61 data/minecraft/tags/items/fence_gates.json
a84d63160bb42d942778124d8368b9db10ef6ed2 data/minecraft/tags/items/gold_ores.json
50da908af11841337ebd0926055c570946b9674e data/minecraft/tags/items/hanging_signs.json
14f7dfe8d83d926d2a7562ef0c8a3295b6ce49cf data/minecraft/tags/items/hoes.json
ee4ac82aede1cc887b0af174d32884fa1ced9c60 data/minecraft/tags/items/hoes.json
08b0595e3c0290061ed898dfbeb230d6c4f95eeb data/minecraft/tags/items/iron_ores.json
e85880d9acf64424927082c80e9af7c9f50de52f data/minecraft/tags/items/lapis_ores.json
65c3a4802e5e6412bef926f01f45d3e81de4c779 data/minecraft/tags/items/leaves.json
11f14987f1510c7fba24ae72c2eeae6ec44275bf data/minecraft/tags/items/pickaxes.json
35edf6af55dc15babf01a19e8a9bfeb683aa7d22 data/minecraft/tags/items/pickaxes.json
e2499ddae4cab1e6aa61231e63816d9fb72ac8f3 data/minecraft/tags/items/planks.json
b87f41ec93385cf003a9e81713446620acd52b86 data/minecraft/tags/items/redstone_ores.json
194ada896e5d1f6d6cac977e3e771bc784d9911b data/minecraft/tags/items/saplings.json
dff5da60a5f06c5c4f35c4f271b7c50221dd704d data/minecraft/tags/items/shovels.json
23fd7d687d86cbfbac57702944adb1f694b6b1f6 data/minecraft/tags/items/shovels.json
3e9990c4b2c8755d00aeb71aa8bfee092a771fdb data/minecraft/tags/items/signs.json
7ad41c3bc6a4b4e320a75ce5e25e9ee075ed3663 data/minecraft/tags/items/slabs.json
8dfd3b492264b019307369b18d494910d7fe89e8 data/minecraft/tags/items/stairs.json
7a7e3ff463f91e4438ef607af19ff3fcc34f183d data/minecraft/tags/items/swords.json
df25b6646f8e4aea4f5aa3634dc892c62e1ec0e5 data/minecraft/tags/items/swords.json
e72a4292dc72ea8e75aa284e652feb7fd955f8b9 data/minecraft/tags/items/walls.json
88f459cee731c19448a25731c1b827b73e0d250d data/minecraft/tags/items/wooden_buttons.json
39fbe102f3d81b28399a10256c82260dc79c4653 data/minecraft/tags/items/wooden_doors.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.1 2024-05-18T13:00:15.1789016 Languages: en_us
70af9a7107ce012ef7b2fd5a531ba400a399c2ab assets/deeperdarker/lang/en_us.json
// 1.20.1 2024-06-17T14:29:08.2085442 Languages: en_us
7a77f9e7b994b8076c057d0cc5103520361c275f assets/deeperdarker/lang/en_us.json
10 changes: 10 additions & 0 deletions src/generated/resources/assets/deeperdarker/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,16 @@
"item.deeperdarker.grime_brick": "Grime Brick",
"item.deeperdarker.heart_of_the_deep": "Heart of the Deep",
"item.deeperdarker.reinforced_echo_shard": "Reinforced Echo Shard",
"item.deeperdarker.resonarium": "Resonarium",
"item.deeperdarker.resonarium_axe": "Resonarium Axe",
"item.deeperdarker.resonarium_boots": "Resonarium Boots",
"item.deeperdarker.resonarium_chestplate": "Resonarium Chestplate",
"item.deeperdarker.resonarium_helmet": "Resonarium Helmet",
"item.deeperdarker.resonarium_hoe": "Resonarium Hoe",
"item.deeperdarker.resonarium_leggings": "Resonarium Leggings",
"item.deeperdarker.resonarium_pickaxe": "Resonarium Pickaxe",
"item.deeperdarker.resonarium_shovel": "Resonarium Shovel",
"item.deeperdarker.resonarium_sword": "Resonarium Sword",
"item.deeperdarker.sculk_bone": "Sculk Bone",
"item.deeperdarker.sculk_centipede_spawn_egg": "Sculk Centipede Spawn Egg",
"item.deeperdarker.sculk_leech_spawn_egg": "Sculk Leech Spawn Egg",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "deeperdarker:item/resonarium"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "deeperdarker:item/resonarium_axe"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "deeperdarker:item/resonarium_boots"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "deeperdarker:item/resonarium_chestplate"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "deeperdarker:item/resonarium_helmet"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "deeperdarker:item/resonarium_hoe"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "deeperdarker:item/resonarium_leggings"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "deeperdarker:item/resonarium_pickaxe"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "deeperdarker:item/resonarium_shovel"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/handheld",
"textures": {
"layer0": "deeperdarker:item/resonarium_sword"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_boots",
"deeperdarker:warden_boots"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_chestplate",
"deeperdarker:warden_chestplate"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_helmet",
"deeperdarker:warden_helmet"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_leggings",
"deeperdarker:warden_leggings"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_axe",
"deeperdarker:warden_axe"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_hoe",
"deeperdarker:warden_hoe"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_pickaxe",
"deeperdarker:warden_pickaxe"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_hoe",
"deeperdarker:warden_shovel"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"values": [
"deeperdarker:resonarium_sword",
"deeperdarker:warden_sword"
]
}
11 changes: 11 additions & 0 deletions src/main/java/com/kyanite/deeperdarker/content/DDItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class DDItems {
public static final RegistryObject<Item> SCULK_BONE = ITEMS.register("sculk_bone", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> SOUL_DUST = ITEMS.register("soul_dust", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> SOUL_CRYSTAL = ITEMS.register("soul_crystal", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM = ITEMS.register("resonarium", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> HEART_OF_THE_DEEP = ITEMS.register("heart_of_the_deep", () -> new WardenHeartItem(new Item.Properties().rarity(Rarity.RARE).stacksTo(1).fireResistant()));
public static final RegistryObject<Item> WARDEN_CARAPACE = ITEMS.register("warden_carapace", () -> new Item(new Item.Properties().rarity(Rarity.RARE).fireResistant()));
public static final RegistryObject<Item> REINFORCED_ECHO_SHARD = ITEMS.register("reinforced_echo_shard", () -> new Item(new Item.Properties().rarity(Rarity.RARE).fireResistant()));
Expand All @@ -54,6 +55,16 @@ public class DDItems {
SmithingTemplateItem.createNetheriteUpgradeIconList(), List.of(new ResourceLocation(DeeperDarker.MOD_ID, "item/empty_slot_shard"))
));

public static final RegistryObject<Item> RESONARIUM_SHOVEL = ITEMS.register("resonarium_shovel", () -> new ShovelItem(DDTiers.RESONARIUM, 1.5f, -3, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_PICKAXE = ITEMS.register("resonarium_pickaxe", () -> new PickaxeItem(DDTiers.RESONARIUM, 1, -2.8f, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_AXE = ITEMS.register("resonarium_axe", () -> new AxeItem(DDTiers.RESONARIUM, 5, -3, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_HOE = ITEMS.register("resonarium_hoe", () -> new HoeItem(DDTiers.RESONARIUM, -4, 0, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_SWORD = ITEMS.register("resonarium_sword", () -> new SwordItem(DDTiers.RESONARIUM, 3, -2.4f, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_HELMET = ITEMS.register("resonarium_helmet", () -> new ArmorItem(DDArmorMaterials.RESONARIUM, ArmorItem.Type.HELMET, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_CHESTPLATE = ITEMS.register("resonarium_chestplate", () -> new ArmorItem(DDArmorMaterials.RESONARIUM, ArmorItem.Type.CHESTPLATE, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_LEGGINGS = ITEMS.register("resonarium_leggings", () -> new ArmorItem(DDArmorMaterials.RESONARIUM, ArmorItem.Type.LEGGINGS, new Item.Properties()));
public static final RegistryObject<Item> RESONARIUM_BOOTS = ITEMS.register("resonarium_boots", () -> new ArmorItem(DDArmorMaterials.RESONARIUM, ArmorItem.Type.BOOTS, new Item.Properties()));

public static final RegistryObject<Item> WARDEN_SHOVEL = ITEMS.register("warden_shovel", () -> new ShovelItem(DDTiers.WARDEN, 1.5f, -3, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
public static final RegistryObject<Item> WARDEN_PICKAXE = ITEMS.register("warden_pickaxe", () -> new PickaxeItem(DDTiers.WARDEN, 1, -2.8f, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
public static final RegistryObject<Item> WARDEN_AXE = ITEMS.register("warden_axe", () -> new AxeItem(DDTiers.WARDEN, 5, -3, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,15 @@ protected void registerModels() {
itemModel(DDItems.GRIME_BALL, GENERATED);
itemModel(DDItems.GRIME_BRICK, GENERATED);

itemModel(DDItems.RESONARIUM_SHOVEL, HANDHELD);
itemModel(DDItems.RESONARIUM_PICKAXE, HANDHELD);
itemModel(DDItems.RESONARIUM_AXE, HANDHELD);
itemModel(DDItems.RESONARIUM_HOE, HANDHELD);
itemModel(DDItems.RESONARIUM_SWORD, HANDHELD);
itemModel(DDItems.RESONARIUM_HELMET, GENERATED);
itemModel(DDItems.RESONARIUM_CHESTPLATE, GENERATED);
itemModel(DDItems.RESONARIUM_LEGGINGS, GENERATED);
itemModel(DDItems.RESONARIUM_BOOTS, GENERATED);
itemModel(DDItems.WARDEN_SHOVEL, HANDHELD);
itemModel(DDItems.WARDEN_PICKAXE, HANDHELD);
itemModel(DDItems.WARDEN_AXE, HANDHELD);
Expand All @@ -185,6 +194,7 @@ protected void registerModels() {
itemModel(DDItems.SCULK_BONE, GENERATED);
itemModel(DDItems.SOUL_DUST, GENERATED);
itemModel(DDItems.SOUL_CRYSTAL, GENERATED);
itemModel(DDItems.RESONARIUM, GENERATED);
itemModel(DDItems.HEART_OF_THE_DEEP, GENERATED);
itemModel(DDItems.WARDEN_CARAPACE, GENERATED);
itemModel(DDItems.REINFORCED_ECHO_SHARD, GENERATED);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,16 @@ protected void addTags(HolderLookup.@NotNull Provider pProvider) {

tag(ItemTags.BOATS).add(DDItems.ECHO_BOAT.get(), DDItems.BLOOM_BOAT.get());
tag(ItemTags.CHEST_BOATS).add(DDItems.ECHO_CHEST_BOAT.get(), DDItems.BLOOM_CHEST_BOAT.get());
tag(ItemTags.SHOVELS).add(DDItems.WARDEN_SHOVEL.get());
tag(ItemTags.PICKAXES).add(DDItems.WARDEN_PICKAXE.get());
tag(ItemTags.AXES).add(DDItems.WARDEN_AXE.get());
tag(ItemTags.HOES).add(DDItems.WARDEN_HOE.get());
tag(ItemTags.SWORDS).add(DDItems.WARDEN_SWORD.get());
tag(ItemTags.SHOVELS).add(DDItems.RESONARIUM_HOE.get(), DDItems.WARDEN_SHOVEL.get());
tag(ItemTags.PICKAXES).add(DDItems.RESONARIUM_PICKAXE.get(), DDItems.WARDEN_PICKAXE.get());
tag(ItemTags.AXES).add(DDItems.RESONARIUM_AXE.get(), DDItems.WARDEN_AXE.get());
tag(ItemTags.HOES).add(DDItems.RESONARIUM_HOE.get(), DDItems.WARDEN_HOE.get());
tag(ItemTags.SWORDS).add(DDItems.RESONARIUM_SWORD.get(), DDItems.WARDEN_SWORD.get());

tag(Tags.Items.ARMORS_HELMETS).add(DDItems.WARDEN_HELMET.get());
tag(Tags.Items.ARMORS_CHESTPLATES).add(DDItems.WARDEN_CHESTPLATE.get());
tag(Tags.Items.ARMORS_LEGGINGS).add(DDItems.WARDEN_LEGGINGS.get());
tag(Tags.Items.ARMORS_BOOTS).add(DDItems.WARDEN_BOOTS.get());
tag(Tags.Items.ARMORS_HELMETS).add(DDItems.RESONARIUM_HELMET.get(), DDItems.WARDEN_HELMET.get());
tag(Tags.Items.ARMORS_CHESTPLATES).add(DDItems.RESONARIUM_CHESTPLATE.get(), DDItems.WARDEN_CHESTPLATE.get());
tag(Tags.Items.ARMORS_LEGGINGS).add(DDItems.RESONARIUM_LEGGINGS.get(), DDItems.WARDEN_LEGGINGS.get());
tag(Tags.Items.ARMORS_BOOTS).add(DDItems.RESONARIUM_BOOTS.get(), DDItems.WARDEN_BOOTS.get());

tag(DDTags.Items.DAMPENS_VIBRATIONS).add(DDItems.WARDEN_BOOTS.get());
}
Expand Down
Loading

0 comments on commit a8cf4e5

Please sign in to comment.