Skip to content

Commit d82f5d8

Browse files
authored
Merge pull request #48 from Xaidee/feature/compat-items
2 parents 78843f0 + ef0d9d3 commit d82f5d8

38 files changed

+420
-133
lines changed

build.gradle

+8-35
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ minecraft {
4141
}
4242

4343
data {
44-
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), "--existing-mod", "blueprint"
44+
args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), "--existing-mod", "blueprint", "--existing-mod", "shieldexp"
4545
taskName 'Data'
4646
}
4747

@@ -97,40 +97,16 @@ dependencies {
9797
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
9898

9999
// Compatibilities
100+
runtimeOnly(fg.deobf("maven.modrinth:create:${create_version}"))
101+
implementation(fg.deobf("maven.modrinth:farmers-delight:${farmersdelight_version}"))
102+
implementation(fg.deobf("maven.modrinth:nethers-delight:${nethersdelight_version}"))
103+
implementation(fg.deobf("maven.modrinth:shield-expansion:${shieldexpansion_version}"))
100104
implementation(fg.deobf("maven.modrinth:create:${create_version}"))
101105

102106
// For dev testing
103107
runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))
104108
runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}"))
105109

106-
/* implementation fg.deobf("curse.maven:detailab-520755:${detailab_version}")
107-
108-
compileOnly fg.deobf("curse.maven:farmers-delight-398521:${farmersdelight_version}")
109-
runtimeOnly fg.deobf("curse.maven:farmers-delight-398521:${farmersdelight_version}")
110-
111-
compileOnly fg.deobf("curse.maven:shield-expansion-583318:${shieldexpansion_version}")
112-
runtimeOnly fg.deobf("curse.maven:shield-expansion-583318:${shieldexpansion_version}")
113-
114-
compileOnly fg.deobf("curse.maven:nethers-delight-496394:${nethersdelight_version}")
115-
runtimeOnly fg.deobf("curse.maven:nethers-delight-496394:${nethersdelight_version}")
116-
117-
compileOnly fg.deobf("curse.maven:quark-243121:${quark_verion}")
118-
runtimeOnly fg.deobf("curse.maven:quark-243121:${quark_verion}")
119-
runtimeOnly fg.deobf("curse.maven:autoreglib-250363:${autoreglib_version}")
120-
121-
compileOnly fg.deobf("curse.maven:modest-mining-533775:${modestmining_version}")
122-
runtimeOnly fg.deobf("curse.maven:modest-mining-533775:${modestmining_version}")
123-
runtimeOnly fg.deobf("curse.maven:geckolib-388172:${geckolib_version}")
124-
*/
125-
126-
127-
/*
128-
If 'Data' fails to run try comment out the below dependencies
129-
*/
130-
//runtimeOnly fg.deobf("curse.maven:supplementaries-412082:${supplementaries_version}")
131-
//runtimeOnly fg.deobf("curse.maven:selene-499980:${selene_version}")
132-
///
133-
134110
/// Utilities for the development environment
135111
//runtimeOnly fg.deobf("curse.maven:jade-324717:${jade_version}")
136112
// compile against the JEI API but do not include it at runtime
@@ -139,11 +115,8 @@ dependencies {
139115
// at runtime, use the full JEI jar for Forge
140116
runtimeOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}"))
141117

142-
//runtimeOnly fg.deobf("curse.maven:catalogue-459701:${catalogue_version}")
143-
//runtimeOnly fg.deobf("curse.maven:configured-457570:${configured_version}")
144-
145-
//runtimeOnly fg.deobf("curse.maven:oculus-581495:${oculus_version}")
146-
//runtimeOnly fg.deobf("curse.maven:rubidium-574856:${rubidium_version}")
118+
runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}"))
119+
runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}"))
147120
///
148121
}
149122

@@ -157,7 +130,7 @@ jar {
157130
'Implementation-Version' : project.jar.archiveVersion,
158131
'Implementation-Vendor' : mod_author,
159132
'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
160-
'Timestampe' : System.currentTimeMillis(),
133+
'Timestamp' : System.currentTimeMillis(),
161134
'Built-On-Java' : "${System.getProperty('java.vm.version')} (${System.getProperty('java.vm.vendor')})",
162135
'Build-On-Minecraft' : minecraft_version
163136
])

gradle.properties

+12-23
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,24 @@ org.gradle.jvmargs=-Xmx4G
1010
org.gradle.daemon=false
1111

1212
# Minecraft
13-
minecraft_version = 1.20.1
13+
minecraft_version=1.20.1
1414

1515
# Forge
16-
forgegradle_version = 5.1.+
16+
forgegradle_version=5.1.+
1717
forge_version=47.1.3
1818

1919
# Mixin
20-
mixingradle_version = 0.7-SNAPSHOT
21-
mixin_version = 0.8.5
20+
mixingradle_version=0.7-SNAPSHOT
21+
mixin_version=0.8.5
2222

2323
# Other Dependencies
2424
blueprint_version=7.1.0
25-
jei_version = 15.0.0.12
25+
jei_version=15.0.0.12
2626

27-
detailab_version = 3920487
28-
farmersdelight_version = 3999157
29-
shieldexpansion_version = 4461135
30-
create_version = HNYrbfZZ
31-
nethersdelight_version = 3971576
32-
quark_verion = 4480516
33-
autoreglib_version = 4100299
34-
modestmining_version = 4501837
35-
geckolib_version = 4096661
36-
supplementaries_version = 4488276
37-
selene_version = 4491267
38-
jade_version = 4433884
39-
catalogue_version = 4171024
40-
configured_version = 4462837
41-
oculus_version = 4299147
42-
rubidium_version = 4448157
43-
scannable_version = 2FlwUOgm
44-
architectury_version = tBWqtdBO
27+
farmersdelight_version=1.20.1-1.2.4
28+
nethersdelight_version=MTDQhZd2
29+
shieldexpansion_version=8mpKmudC
30+
create_version=HNYrbfZZ
31+
supplementaries_version=4488276
32+
scannable_version=2FlwUOgm
33+
architectury_version=tBWqtdBO

src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-07-22T22:07:33.4666831 oreganized Item Models
1+
// 1.20.1 2024-08-28T12:15:19.543716 oreganized Item Models
22
18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json
33
30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json
44
8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json
@@ -50,6 +50,7 @@ fc91dfa3eda2433202da6e5b35a2daaa798ceb10 assets/oreganized/models/item/electrum_
5050
c0994add3605609d1e1e5c5fd8e8a2183965dd6a assets/oreganized/models/item/electrum_helmet_redstone_trim.json
5151
dabbb804096b43b53b35e91e6af0be9e3159d7c4 assets/oreganized/models/item/electrum_hoe.json
5252
a81f54a67369904cffeb3725f1391afced85c5fd assets/oreganized/models/item/electrum_ingot.json
53+
11e1d020c32c5e56cd1342822536378ea1069379 assets/oreganized/models/item/electrum_knife.json
5354
95afdd8f132febac54f8a5854a7a3fd68ac451f2 assets/oreganized/models/item/electrum_leggings.json
5455
2d13f8dc0ed0ec41e0b6a19101658c335f0937af assets/oreganized/models/item/electrum_leggings_amethyst_trim.json
5556
1c197c2053679693edc08a7440503e27a67a36e9 assets/oreganized/models/item/electrum_leggings_copper_trim.json
@@ -61,8 +62,11 @@ cb422c237c7d4e168c79cee51375d667fcf1d2fa assets/oreganized/models/item/electrum_
6162
8d1a23960f88d2cf9e152ed5a630ceb23c79c56f assets/oreganized/models/item/electrum_leggings_netherite_trim.json
6263
f3871ff234873195dd47e570e62f802f7f67c889 assets/oreganized/models/item/electrum_leggings_quartz_trim.json
6364
75958844281a29549508f88f396e34b0919b68cb assets/oreganized/models/item/electrum_leggings_redstone_trim.json
65+
2b65eac6675b9a9f27684237b88951fd63b4687e assets/oreganized/models/item/electrum_machete.json
6466
2d8ac3c987dcd961d7505b71cda23b4c149a1348 assets/oreganized/models/item/electrum_nugget.json
6567
225acc16e9cf1908e9199f83cfe63342fc724cf2 assets/oreganized/models/item/electrum_pickaxe.json
68+
0f676c5ced38f926facc18f78f2f2545b4c44342 assets/oreganized/models/item/electrum_shield.json
69+
16885683d24d78fa77d3f26ca06cd0016977b47e assets/oreganized/models/item/electrum_shield_blocking.json
6670
ba6dafcb3b21faf4eb7886b812f205e91e59a49d assets/oreganized/models/item/electrum_shovel.json
6771
05cacc76a2e9820c58a78e8456d69278e41ce32f assets/oreganized/models/item/electrum_sword.json
6872
35a59e558e3caa534b1d2e155dea97863ed6bd56 assets/oreganized/models/item/electrum_upgrade_smithing_template.json

src/generated/resources/.cache/86c4ba3fec62c329e6b7e74d87569e08181a0d37

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// 1.20.1 2024-07-24T21:36:25.8657027 Oreganized Item Tags
1+
// 1.20.1 2024-08-28T12:15:19.5456297 Oreganized Item Tags
2+
3a2cbf8d34e9bde2e22d59d4437fa80361d53291 data/farmersdelight/tags/items/tools/knives.json
23
d8d286ea76e30a635512bc93d68815770003ff41 data/forge/tags/items/buckets/molten_lead.json
34
7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/items/glass.json
45
d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/items/glass_panes.json
@@ -19,25 +20,34 @@ ec067464a41bb65b72566d6a4e4ffccb80261bf7 data/forge/tags/items/ores_in_ground/st
1920
66ba659939fbf946a12fd974e4b1aa050d6c0d1c data/forge/tags/items/raw_materials.json
2021
eb55c33bcf31bb18b06d5138f9d4ae7877d9739d data/forge/tags/items/raw_materials/lead.json
2122
84d8f3093299dc4984a33c737ac8ff8964e135da data/forge/tags/items/raw_materials/silver.json
23+
3d43625006347afbc2d100972433d9af9db7ac3e data/forge/tags/items/shields.json
2224
346b0b24e693e29050a326ff267fb8c28bcfd21d data/forge/tags/items/storage_blocks.json
2325
7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/forge/tags/items/storage_blocks/electrum.json
2426
bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/items/storage_blocks/lead.json
2527
4fb94c8b6f6641d27d70e8ff338e81cee30a321c data/forge/tags/items/storage_blocks/raw_lead.json
2628
05f4708355ed88fe57116020dd93ac53f3098dba data/forge/tags/items/storage_blocks/raw_silver.json
2729
bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/items/storage_blocks/silver.json
2830
4c880b8d05c88b2f9b44580057a8b4d2fd6fddc4 data/forge/tags/items/tools/bush_hammer.json
31+
3a2cbf8d34e9bde2e22d59d4437fa80361d53291 data/forge/tags/items/tools/knives.json
32+
ddc75b2f884f2deef1eb71418b0fc4ff6784c5f1 data/minecraft/tags/items/axes.json
2933
9115563bba2db6e89c2c107626da06ea199aa2c7 data/minecraft/tags/items/beacon_payment_items.json
3034
503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/items/doors.json
35+
eef83cdf136be620185d326ac306dc8b3680b0ce data/minecraft/tags/items/hoes.json
3136
5978220d099c8bf975bbd69e364ac49628f6dec7 data/minecraft/tags/items/music_discs.json
37+
b20c1b1653f973a0f1474db47ae9c0e1f8515c42 data/minecraft/tags/items/pickaxes.json
38+
c52b4dbffb6c07a4fbc75a2ce481671384feb984 data/minecraft/tags/items/shovels.json
3239
e9873026bc587ab0729bda85f9d2a6ca7790d410 data/minecraft/tags/items/slabs.json
3340
e231a716e19756d6a2326e873062dab206b37184 data/minecraft/tags/items/stairs.json
41+
959791060c5661f7f86dedec67300177b0735bec data/minecraft/tags/items/swords.json
3442
0071c009a80f1ab7661b261dcf94799070b8cbea data/minecraft/tags/items/trapdoors.json
3543
bd1440ab62499b2be9d2d4050f2d30cbb306b34f data/minecraft/tags/items/trimmable_armor.json
3644
9c01ba5c2837c6d506fea127ca2a1b2ba24e2fe0 data/minecraft/tags/items/trim_materials.json
3745
a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/items/walls.json
46+
6c25715524e8df396dd757255895117ff2451b25 data/nethersdelight/tags/items/tools/machetes.json
3847
81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/items/crystal_glass.json
3948
f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/items/crystal_glass_panes.json
4049
bf2ad799074f5c44acee490bdf3d3ae81d56997b data/oreganized/tags/items/gargoyle_snack.json
4150
f7810c755845dc955112f7b0cedf68260ad693cc data/oreganized/tags/items/lead_source.json
4251
376b7c9ff449a4b98cb7b1f65b47d658c4e39428 data/oreganized/tags/items/lighter_than_lead.json
4352
3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/items/stone_types/glance.json
53+
3d43625006347afbc2d100972433d9af9db7ac3e data/shieldexp/tags/items/shields.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.1 2024-07-22T22:02:00.7171536 Recipes
1+
// 1.20.1 2024-08-28T12:15:19.5367066 Recipes
22
c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json
33
ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json
44
40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json
@@ -117,8 +117,11 @@ ab8a88c72e15d139634ee1ee62bbd74ad92001d0 data/oreganized/advancements/recipes/mi
117117
bf845f94976369f712e8400c3c309914805b0f85 data/oreganized/advancements/recipes/misc/electrum_chestplate.json
118118
06566b6fc43f73a99e1a0535f6d1160c57567c59 data/oreganized/advancements/recipes/misc/electrum_helmet.json
119119
a1ec7610a511d24d9db99cc2bd83681982fbf51f data/oreganized/advancements/recipes/misc/electrum_hoe.json
120+
19c675cf37ccc87206dbd86cc2ccf4e9502d651c data/oreganized/advancements/recipes/misc/electrum_knife.json
120121
65b56593eac2b513d8fa0535e105e186c056ebee data/oreganized/advancements/recipes/misc/electrum_leggings.json
122+
87c0104bbee244abc1deddd48eb041f2db1fb767 data/oreganized/advancements/recipes/misc/electrum_machete.json
121123
02620b2da35b3e1d2324a94603e5b973adc5e962 data/oreganized/advancements/recipes/misc/electrum_pickaxe.json
124+
363103c5720efb98f1aa5760e30ab45f7c9fb304 data/oreganized/advancements/recipes/misc/electrum_shield.json
122125
58c33b42d00ef50433eda9f25ea00c298532d093 data/oreganized/advancements/recipes/misc/electrum_shovel.json
123126
b5a1699e8a4bc63dcfb5412b22fb72817a8b3b1c data/oreganized/advancements/recipes/misc/electrum_sword.json
124127
1d811909bcfe63a3a5950c6e9bc1d70535645605 data/oreganized/advancements/recipes/misc/electrum_upgrade_smithing_template.json
@@ -163,9 +166,12 @@ c8502d8a714cc82e207b2ad97b2e850cf3917412 data/oreganized/recipes/electrum_helmet
163166
1189d31e075d6909f3583ba7f2d5de2bd7cd1c91 data/oreganized/recipes/electrum_hoe.json
164167
69c5963caea3066816b59f94dcccd3d9ba483375 data/oreganized/recipes/electrum_ingot_from_block.json
165168
112f3c308899ff08a6e3748eeb169574c6d14039 data/oreganized/recipes/electrum_ingot_from_nuggets.json
169+
d4434e571f38b5c051bd1010490538e7abe87991 data/oreganized/recipes/electrum_knife.json
166170
f6691dd342ce33ca9fabde7156cf12c5968c1369 data/oreganized/recipes/electrum_leggings.json
171+
c24de7bbb04a1939e6a036255e8329f65c1d96ae data/oreganized/recipes/electrum_machete.json
167172
8079094659f955b3e1b3735c9a89cbbaeca01552 data/oreganized/recipes/electrum_nugget.json
168173
db731a127ba3046ceee5ae0e2f6e86d5d01504b2 data/oreganized/recipes/electrum_pickaxe.json
174+
7af48b1f6b76e4e8d2dcf51f4335a66cd328e0fe data/oreganized/recipes/electrum_shield.json
169175
facfd8f07459c400bb70163f4867e70d66652787 data/oreganized/recipes/electrum_shovel.json
170176
cf15ffd760d39ce405ab20a1a677b1798ae80437 data/oreganized/recipes/electrum_sword.json
171177
4a09ce0c226b618b61938286b85395b81ecb3efb data/oreganized/recipes/electrum_upgrade_smithing_template.json

src/generated/resources/assets/oreganized/lang/en_us.json

+3
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,12 @@
111111
"item.oreganized.electrum_helmet": "Electrum Helmet",
112112
"item.oreganized.electrum_hoe": "Electrum Hoe",
113113
"item.oreganized.electrum_ingot": "Electrum Ingot",
114+
"item.oreganized.electrum_knife": "Electrum Knife",
114115
"item.oreganized.electrum_leggings": "Electrum Leggings",
116+
"item.oreganized.electrum_machete": "Electrum Machete",
115117
"item.oreganized.electrum_nugget": "Electrum Nugget",
116118
"item.oreganized.electrum_pickaxe": "Electrum Pickaxe",
119+
"item.oreganized.electrum_shield": "Electrum Shield",
117120
"item.oreganized.electrum_shovel": "Electrum Shovel",
118121
"item.oreganized.electrum_sword": "Electrum Sword",
119122
"item.oreganized.lead_bolt": "Lead Bolt",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "oreganized:item/electrum_knife"
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "oreganized:item/electrum_machete"
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"parent": "shieldexp:item/netherite_shield",
3+
"gui_light": "front",
4+
"overrides": [
5+
{
6+
"model": "oreganized:item/electrum_shield_blocking",
7+
"predicate": {
8+
"minecraft:blocking": 1.0
9+
}
10+
}
11+
],
12+
"textures": {
13+
"1": "oreganized:item/electrum_shield",
14+
"particle": "oreganized:item/electrum_shield"
15+
}
16+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "shieldexp:item/netherite_shield_blocking",
3+
"gui_light": "front",
4+
"textures": {
5+
"1": "oreganized:item/electrum_shield",
6+
"particle": "oreganized:item/electrum_shield"
7+
}
8+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_knife"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_shield"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_knife"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_axe"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_hoe"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_pickaxe"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_shovel"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_sword"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"values": [
3+
"oreganized:electrum_machete"
4+
]
5+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_oreganized:electrum_ingot": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": [
9+
"oreganized:electrum_ingot"
10+
]
11+
}
12+
]
13+
},
14+
"trigger": "minecraft:inventory_changed"
15+
},
16+
"has_the_recipe": {
17+
"conditions": {
18+
"recipe": "oreganized:electrum_knife"
19+
},
20+
"trigger": "minecraft:recipe_unlocked"
21+
}
22+
},
23+
"requirements": [
24+
[
25+
"has_oreganized:electrum_ingot",
26+
"has_the_recipe"
27+
]
28+
],
29+
"rewards": {
30+
"recipes": [
31+
"oreganized:electrum_knife"
32+
]
33+
},
34+
"sends_telemetry_event": false
35+
}

0 commit comments

Comments
 (0)