Skip to content

Commit

Permalink
fix: #28
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelHillcox committed Jun 19, 2024
1 parent 5a90374 commit 48409e0
Show file tree
Hide file tree
Showing 67 changed files with 86 additions and 69 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Just Hammers Changelog

## [21.0.1]

### Fixed

- Unable to craft hammers due to missing recipes

## [21.0.0]

### Changed
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ loom {
dependencies {
modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
modApi "dev.architectury:architectury:${rootProject.architectury_version}"
// modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}"
modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}"
}

publishing {
Expand Down
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"

// modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"

common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
// 1.20.6 2024-06-10T17:19:33.584842 Just Hammers/Recipes
d078c8bd8b0391af38bbe89041e46b37a25354c5 data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json
e4bf90b25333095cefe913b5f80a8f8107bcab78 data/justhammers/advancements/recipes/tools/impact_core.json
e87546e3759a56e31cf702e525c33c89a9923501 data/justhammers/recipes/diamond_reinforced_impact_hammer.json
b187b53efaa4d853b0324371b00598422299d4d9 data/justhammers/recipes/netherite_reinforced_impact_hammer.json
24342009fd715e1ec9f25f785d9b08af08156671 data/justhammers/recipes/diamond_destructor_hammer.json
e960bfe3a1920b6f053cd525ceb81111adf536db data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json
dd0ba4267b623d288a79e46e67862dd736e730ef data/justhammers/recipes/stone_destructor_hammer.json
bd3f7a17e17393374a2a91c25f6077ca60c9a657 data/justhammers/recipes/diamond_hammer.json
725b523ca390768efebfd8953430f71038ceb0f6 data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json
b60f80b71df5643e61788ef398b3b4e19d811e6b data/justhammers/recipes/iron_destructor_hammer.json
adbefde2664cbff80d4f02b5504827518da6f963 data/justhammers/recipes/iron_impact_hammer.json
770db99b6530b132e3aa46a37023e850c77719cc data/justhammers/recipes/reinforced_core.json
e9b8ab81dca2abecbb0e921f5a56f51fe0c1e1a4 data/justhammers/recipes/reinforced_impact_core.json
df19dad9550196f4168bf7b32bc359d6acca6118 data/justhammers/recipes/stone_hammer.json
0496ca84718458cb1a03d67c1c6755cd59fb1c52 data/justhammers/advancements/recipes/tools/iron_hammer.json
79591d082529420406f61793248642e4a8acf6f2 data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json
7238b4229a4052e341be4149041b9258d6c05df8 data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json
305459c101de66ef42e370d1426e494b61bf637c data/justhammers/recipes/stone_impact_hammer.json
4d5c47668ec41b1dbc3ad7dcce3c8b8c34165bdd data/justhammers/advancements/recipes/tools/gold_impact_hammer.json
d7d2ee01a460c8382878c031cd8c60b1d158ae4f data/justhammers/recipes/netherite_destructor_hammer.json
8a4513a11ce37e51685e05f3c504b80ccf08fa6b data/justhammers/recipes/stone_reinforced_impact_hammer.json
e46f14f541a624c6d38d6d2eaa2d46e97fa96355 data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json
4956c90fa2d007305814e432e1d8fef117e26d65 data/justhammers/recipes/gold_destructor_hammer.json
d39de9ba8a46625cddaccdf751e40f8b0c9b9e1a data/justhammers/advancements/recipes/tools/gold_hammer.json
c873416043e364ce7d1f246e760cd82ff88084d0 data/justhammers/advancements/recipes/tools/reinforced_impact_core.json
fa9615ba639634649982afa022c056c9ce712c9f data/justhammers/recipes/netherite_impact_hammer.json
34af40de88883e3a8bd3d8b10d8b4be399553ffd data/justhammers/recipes/stone_reinforced_hammer.json
8ef97fae8b093f8fa1d3ce0a61122d5e092ec9dc data/justhammers/recipes/gold_hammer.json
ede677891c0725814d26598735db6f6460672aaf data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json
cca5c643dde2c7b267ad68f50057987058bd6211 data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json
b9c5fa224cc6277a4e07c69ddfccc9b072f22447 data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json
7c135c16b91a1f0c859766d4853e06e99a7af507 data/justhammers/recipes/iron_hammer.json
b649ca87f6eb0d8e6c451a85f1dfb028fedf6f93 data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json
374a4767ae7063c4530030ab99a4a8f9caab6262 data/justhammers/advancements/recipes/tools/diamond_hammer.json
d1d2ade7210dac15c1b1d5c516474eafd3f583b2 data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json
fd0e43c2aa4767111a31fb562d693c9e639496ca data/justhammers/recipes/diamond_reinforced_hammer.json
c56f61f15b1df8ad137b553b61e23374238531cc data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json
1d4d6cab9e71b65b36fad222512c52d53b86191e data/justhammers/recipes/iron_reinforced_impact_hammer.json
160a38ca68d7c356603ac2f39a828b379b3644dd data/justhammers/recipes/netherite_reinforced_hammer.json
4d91d301ca671d4c2956cfa94eb4a942bf19e175 data/justhammers/advancements/recipes/tools/iron_impact_hammer.json
2b914fe5ca8b2369d3f60936002f7acaea7f108d data/justhammers/recipes/destructor_core.json
3955773485fb2702affa034441c965bbd9cf64d2 data/justhammers/advancements/recipes/tools/netherite_hammer.json
d85b1fc82b3795f0232a74f96a25a27782728328 data/justhammers/recipes/iron_reinforced_hammer.json
54b20c18742e6e050177462f98405ea7d017fad4 data/justhammers/advancements/recipes/tools/stone_impact_hammer.json
5123f9482a076000ebdf4d2dce7a330ea4a03b02 data/justhammers/recipes/impact_core.json
6aa2a5f1d82ca751b336cc1b6daf2046b6528f83 data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json
767a5c6e1e5935d966ea435ab7034dafaafc16e3 data/justhammers/recipes/diamond_impact_hammer.json
dbeb2ee1b90b47e9a57b8c29d2912d3cf827a05f data/justhammers/advancements/recipes/tools/reinforced_core.json
95ac81e03f8e3cba6e41e636e9ebda2dfe96b054 data/justhammers/advancements/recipes/tools/destructor_core.json
811023eccccb77561949c312cf0a8ce5fcacbf2f data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json
07816b20c47189e8368a59d9038fdc1ee9abc970 data/justhammers/advancements/recipes/tools/stone_hammer.json
1f90d76abd8134ce788ab305442a68bd78eab719 data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json
551c12b18c8b0b6dbcc4aaebc6547d4cbf539cfc data/justhammers/recipes/gold_impact_hammer.json
65db0e9c8365d6bb1d6c92a4f2613faae727dfbd data/justhammers/recipes/gold_reinforced_impact_hammer.json
3d98272236cc53a7067753ea0004020297923103 data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json
9d4d71bb80bc568e2bdc047bc710948b82a30127 data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json
3dfeb37dddc1ac4d7f2af313bc6d87b27534251d data/justhammers/recipes/netherite_hammer.json
d709dd74252bfc60ab9abf6809c81e2e236289ac data/justhammers/recipes/gold_reinforced_hammer.json
// 1.21 2024-06-19T18:20:04.25859 Just Hammers/Recipes
c873416043e364ce7d1f246e760cd82ff88084d0 data/justhammers/advancement/recipes/tools/reinforced_impact_core.json
770db99b6530b132e3aa46a37023e850c77719cc data/justhammers/recipe/reinforced_core.json
7c135c16b91a1f0c859766d4853e06e99a7af507 data/justhammers/recipe/iron_hammer.json
3dfeb37dddc1ac4d7f2af313bc6d87b27534251d data/justhammers/recipe/netherite_hammer.json
1f90d76abd8134ce788ab305442a68bd78eab719 data/justhammers/advancement/recipes/tools/diamond_destructor_hammer.json
6aa2a5f1d82ca751b336cc1b6daf2046b6528f83 data/justhammers/advancement/recipes/tools/netherite_reinforced_impact_hammer.json
7238b4229a4052e341be4149041b9258d6c05df8 data/justhammers/advancement/recipes/tools/iron_destructor_hammer.json
3955773485fb2702affa034441c965bbd9cf64d2 data/justhammers/advancement/recipes/tools/netherite_hammer.json
07816b20c47189e8368a59d9038fdc1ee9abc970 data/justhammers/advancement/recipes/tools/stone_hammer.json
4d5c47668ec41b1dbc3ad7dcce3c8b8c34165bdd data/justhammers/advancement/recipes/tools/gold_impact_hammer.json
dd0ba4267b623d288a79e46e67862dd736e730ef data/justhammers/recipe/stone_destructor_hammer.json
cca5c643dde2c7b267ad68f50057987058bd6211 data/justhammers/advancement/recipes/tools/stone_reinforced_hammer.json
1d4d6cab9e71b65b36fad222512c52d53b86191e data/justhammers/recipe/iron_reinforced_impact_hammer.json
160a38ca68d7c356603ac2f39a828b379b3644dd data/justhammers/recipe/netherite_reinforced_hammer.json
d85b1fc82b3795f0232a74f96a25a27782728328 data/justhammers/recipe/iron_reinforced_hammer.json
8a4513a11ce37e51685e05f3c504b80ccf08fa6b data/justhammers/recipe/stone_reinforced_impact_hammer.json
d7d2ee01a460c8382878c031cd8c60b1d158ae4f data/justhammers/recipe/netherite_destructor_hammer.json
d1d2ade7210dac15c1b1d5c516474eafd3f583b2 data/justhammers/advancement/recipes/tools/iron_reinforced_hammer.json
4d91d301ca671d4c2956cfa94eb4a942bf19e175 data/justhammers/advancement/recipes/tools/iron_impact_hammer.json
8ef97fae8b093f8fa1d3ce0a61122d5e092ec9dc data/justhammers/recipe/gold_hammer.json
d078c8bd8b0391af38bbe89041e46b37a25354c5 data/justhammers/advancement/recipes/tools/gold_reinforced_hammer.json
3d98272236cc53a7067753ea0004020297923103 data/justhammers/advancement/recipes/tools/diamond_reinforced_impact_hammer.json
d709dd74252bfc60ab9abf6809c81e2e236289ac data/justhammers/recipe/gold_reinforced_hammer.json
9d4d71bb80bc568e2bdc047bc710948b82a30127 data/justhammers/advancement/recipes/tools/netherite_destructor_hammer.json
e87546e3759a56e31cf702e525c33c89a9923501 data/justhammers/recipe/diamond_reinforced_impact_hammer.json
54b20c18742e6e050177462f98405ea7d017fad4 data/justhammers/advancement/recipes/tools/stone_impact_hammer.json
0496ca84718458cb1a03d67c1c6755cd59fb1c52 data/justhammers/advancement/recipes/tools/iron_hammer.json
fd0e43c2aa4767111a31fb562d693c9e639496ca data/justhammers/recipe/diamond_reinforced_hammer.json
b187b53efaa4d853b0324371b00598422299d4d9 data/justhammers/recipe/netherite_reinforced_impact_hammer.json
767a5c6e1e5935d966ea435ab7034dafaafc16e3 data/justhammers/recipe/diamond_impact_hammer.json
305459c101de66ef42e370d1426e494b61bf637c data/justhammers/recipe/stone_impact_hammer.json
d39de9ba8a46625cddaccdf751e40f8b0c9b9e1a data/justhammers/advancement/recipes/tools/gold_hammer.json
b9c5fa224cc6277a4e07c69ddfccc9b072f22447 data/justhammers/advancement/recipes/tools/diamond_reinforced_hammer.json
e960bfe3a1920b6f053cd525ceb81111adf536db data/justhammers/advancement/recipes/tools/netherite_impact_hammer.json
e4bf90b25333095cefe913b5f80a8f8107bcab78 data/justhammers/advancement/recipes/tools/impact_core.json
e9b8ab81dca2abecbb0e921f5a56f51fe0c1e1a4 data/justhammers/recipe/reinforced_impact_core.json
e46f14f541a624c6d38d6d2eaa2d46e97fa96355 data/justhammers/advancement/recipes/tools/diamond_impact_hammer.json
b60f80b71df5643e61788ef398b3b4e19d811e6b data/justhammers/recipe/iron_destructor_hammer.json
95ac81e03f8e3cba6e41e636e9ebda2dfe96b054 data/justhammers/advancement/recipes/tools/destructor_core.json
df19dad9550196f4168bf7b32bc359d6acca6118 data/justhammers/recipe/stone_hammer.json
725b523ca390768efebfd8953430f71038ceb0f6 data/justhammers/advancement/recipes/tools/iron_reinforced_impact_hammer.json
adbefde2664cbff80d4f02b5504827518da6f963 data/justhammers/recipe/iron_impact_hammer.json
811023eccccb77561949c312cf0a8ce5fcacbf2f data/justhammers/advancement/recipes/tools/stone_destructor_hammer.json
24342009fd715e1ec9f25f785d9b08af08156671 data/justhammers/recipe/diamond_destructor_hammer.json
5123f9482a076000ebdf4d2dce7a330ea4a03b02 data/justhammers/recipe/impact_core.json
551c12b18c8b0b6dbcc4aaebc6547d4cbf539cfc data/justhammers/recipe/gold_impact_hammer.json
79591d082529420406f61793248642e4a8acf6f2 data/justhammers/advancement/recipes/tools/gold_reinforced_impact_hammer.json
2b914fe5ca8b2369d3f60936002f7acaea7f108d data/justhammers/recipe/destructor_core.json
bd3f7a17e17393374a2a91c25f6077ca60c9a657 data/justhammers/recipe/diamond_hammer.json
4956c90fa2d007305814e432e1d8fef117e26d65 data/justhammers/recipe/gold_destructor_hammer.json
374a4767ae7063c4530030ab99a4a8f9caab6262 data/justhammers/advancement/recipes/tools/diamond_hammer.json
34af40de88883e3a8bd3d8b10d8b4be399553ffd data/justhammers/recipe/stone_reinforced_hammer.json
65db0e9c8365d6bb1d6c92a4f2613faae727dfbd data/justhammers/recipe/gold_reinforced_impact_hammer.json
dbeb2ee1b90b47e9a57b8c29d2912d3cf827a05f data/justhammers/advancement/recipes/tools/reinforced_core.json
b649ca87f6eb0d8e6c451a85f1dfb028fedf6f93 data/justhammers/advancement/recipes/tools/netherite_reinforced_hammer.json
ede677891c0725814d26598735db6f6460672aaf data/justhammers/advancement/recipes/tools/stone_reinforced_impact_hammer.json
c56f61f15b1df8ad137b553b61e23374238531cc data/justhammers/advancement/recipes/tools/gold_destructor_hammer.json
fa9615ba639634649982afa022c056c9ce712c9f data/justhammers/recipe/netherite_impact_hammer.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.20.6 2024-06-10T17:19:33.583904 Just Hammers/Model Definitions
// 1.21 2024-06-19T18:20:04.257891 Just Hammers/Model Definitions
af15d8a613c9b3d3b2fafd9f589b4618a49e06d4 assets/justhammers/models/item/reinforced_core.json
526639661c8278689b9769a5e51319de31a1de17 assets/justhammers/models/item/diamond_hammer.json
9c6dba55240bc68c1be48f897fb802eea9297074 assets/justhammers/models/item/diamond_impact_hammer.json
Expand All @@ -21,8 +21,8 @@ a387b4097cfd712aad40265e47e5ffdb07a9aeff assets/justhammers/models/item/netherit
0695025aea1b0293e66e69bafad03de7572faea6 assets/justhammers/models/item/netherite_destructor_hammer.json
e049949aaa3ac04788449a47472332978e2cdee0 assets/justhammers/models/item/iron_hammer.json
aad67c8b788e76f2fe30ccd12856af5d9d663cfb assets/justhammers/models/item/diamond_destructor_hammer.json
096ad2b98aa9ce0b6724ed480293184dcf2293ee assets/justhammers/models/item/iron_destructor_hammer.json
54c41d64fcbd72df5a70e37dbc92f3612e91a2be assets/justhammers/models/item/stone_destructor_hammer.json
096ad2b98aa9ce0b6724ed480293184dcf2293ee assets/justhammers/models/item/iron_destructor_hammer.json
f2939cbf9f4b7f508f829474bb47ac39fadac71b assets/justhammers/models/item/iron_reinforced_hammer.json
a3d35755dbffac6b9d0de406cc4e208d1eb2e05e assets/justhammers/models/item/iron_impact_hammer.json
51b14b9ca563670a5e6906d7b92dac64dd2e7e03 assets/justhammers/models/item/reinforced_impact_core.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.20.6 2024-06-10T17:19:33.583291 Just Hammers/Language (en_us)
// 1.21 2024-06-19T18:20:04.257351 Just Hammers/Language (en_us)
35eb489b75622d3a6de2a4646dd60da205f971c0 assets/justhammers/lang/en_us.json
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ minecraft_version=1.21
enabled_platforms=fabric,neoforge

archives_base_name=just-hammers
mod_version=21.0.0
mod_version=21.0.1
maven_group=pro.mikey.mods

architectury_version=13.0.1
Expand All @@ -14,7 +14,7 @@ fabric_api_version=0.100.1+1.21

neoforge_version=21.0.10-beta

rei_version=15.0.728
rei_version=16.0.729

# Publishing
modrinth_id=edU0NbZZ
Expand Down
2 changes: 1 addition & 1 deletion neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ dependencies {
// Remove the next line if you don't want to depend on the API
modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"

// modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}"
modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}"

common(project(path: ":common", configuration: "namedElements")) { transitive false }
shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
Expand Down
15 changes: 13 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,19 @@ pluginManagement {
maven { url "https://maven.fabricmc.net/" }
maven { url "https://maven.architectury.dev/" }
maven { url "https://maven.minecraftforge.net/" }
maven { url "https://maven.saps.dev/releases" }
maven { url "https://maven.saps.dev/snapshots" }
maven {
url "https://maven.saps.dev/releases"
content {
includeGroupByRegex("pro.mikey.*")
}
}

maven {
url "https://maven.saps.dev/snapshots"
content {
includeGroupByRegex("pro.mikey.*")
}
}
gradlePluginPortal()
}
}
Expand Down

0 comments on commit 48409e0

Please sign in to comment.