From d625eb54806be414dadb195c47478fec7cc1baac Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Mon, 10 Jun 2024 17:23:26 +0100 Subject: [PATCH] feat: ported to 1.20.6 --- .github/workflows/build.yml | 4 +- .github/workflows/release.yml | 4 +- CHANGELOG.md | 4 +- build.gradle | 44 ++--- common/build.gradle | 2 - .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 59 ------ .../b31be46d105cf2224c912559a58cee2e49a31644 | 30 --- .../pro/mikey/justhammers/HammerItem.java | 89 +++++---- .../client/SelectionOutlineRender.java | 3 +- fabric/build.gradle | 5 + .../07268427ad4253551c9e53b40805557b8cfbf6d7 | 59 ++++++ .../8dbef3b379be9bd0492523874bd3f3db07b6de2c | 30 +++ .../8f94e55bf28316c1b756497c2bd91d7acf749222 | 2 +- .../assets/justhammers/lang/en_us.json | 0 .../models/item/destructor_core.json | 2 +- .../item/diamond_destructor_hammer.json | 2 +- .../models/item/diamond_hammer.json | 2 +- .../models/item/diamond_impact_hammer.json | 2 +- .../item/diamond_reinforced_hammer.json | 2 +- .../diamond_reinforced_impact_hammer.json | 2 +- .../models/item/gold_destructor_hammer.json | 2 +- .../justhammers/models/item/gold_hammer.json | 2 +- .../models/item/gold_impact_hammer.json | 2 +- .../models/item/gold_reinforced_hammer.json | 2 +- .../item/gold_reinforced_impact_hammer.json | 2 +- .../justhammers/models/item/impact_core.json | 2 +- .../models/item/iron_destructor_hammer.json | 2 +- .../justhammers/models/item/iron_hammer.json | 2 +- .../models/item/iron_impact_hammer.json | 2 +- .../models/item/iron_reinforced_hammer.json | 2 +- .../item/iron_reinforced_impact_hammer.json | 2 +- .../item/netherite_destructor_hammer.json | 2 +- .../models/item/netherite_hammer.json | 2 +- .../models/item/netherite_impact_hammer.json | 2 +- .../item/netherite_reinforced_hammer.json | 2 +- .../netherite_reinforced_impact_hammer.json | 2 +- .../models/item/reinforced_core.json | 2 +- .../models/item/reinforced_impact_core.json | 2 +- .../models/item/stone_destructor_hammer.json | 2 +- .../justhammers/models/item/stone_hammer.json | 2 +- .../models/item/stone_impact_hammer.json | 2 +- .../models/item/stone_reinforced_hammer.json | 2 +- .../item/stone_reinforced_impact_hammer.json | 2 +- .../recipes/tools/destructor_core.json | 7 +- .../tools/diamond_destructor_hammer.json | 7 +- .../recipes/tools/diamond_hammer.json | 7 +- .../recipes/tools/diamond_impact_hammer.json | 7 +- .../tools/diamond_reinforced_hammer.json | 7 +- .../diamond_reinforced_impact_hammer.json | 7 +- .../recipes/tools/gold_destructor_hammer.json | 7 +- .../recipes/tools/gold_hammer.json | 7 +- .../recipes/tools/gold_impact_hammer.json | 7 +- .../recipes/tools/gold_reinforced_hammer.json | 7 +- .../tools/gold_reinforced_impact_hammer.json | 7 +- .../recipes/tools/impact_core.json | 7 +- .../recipes/tools/iron_destructor_hammer.json | 7 +- .../recipes/tools/iron_hammer.json | 7 +- .../recipes/tools/iron_impact_hammer.json | 7 +- .../recipes/tools/iron_reinforced_hammer.json | 7 +- .../tools/iron_reinforced_impact_hammer.json | 7 +- .../tools/netherite_destructor_hammer.json | 7 +- .../recipes/tools/netherite_hammer.json | 7 +- .../tools/netherite_impact_hammer.json | 7 +- .../tools/netherite_reinforced_hammer.json | 7 +- .../netherite_reinforced_impact_hammer.json | 7 +- .../recipes/tools/reinforced_core.json | 7 +- .../recipes/tools/reinforced_impact_core.json | 7 +- .../tools/stone_destructor_hammer.json | 7 +- .../recipes/tools/stone_hammer.json | 7 +- .../recipes/tools/stone_impact_hammer.json | 7 +- .../tools/stone_reinforced_hammer.json | 7 +- .../tools/stone_reinforced_impact_hammer.json | 7 +- .../justhammers/recipes/destructor_core.json | 6 +- .../recipes/diamond_destructor_hammer.json | 6 +- .../justhammers/recipes/diamond_hammer.json | 6 +- .../recipes/diamond_impact_hammer.json | 6 +- .../recipes/diamond_reinforced_hammer.json | 6 +- .../diamond_reinforced_impact_hammer.json | 6 +- .../recipes/gold_destructor_hammer.json | 6 +- .../data/justhammers/recipes/gold_hammer.json | 6 +- .../recipes/gold_impact_hammer.json | 6 +- .../recipes/gold_reinforced_hammer.json | 6 +- .../gold_reinforced_impact_hammer.json | 6 +- .../data/justhammers/recipes/impact_core.json | 6 +- .../recipes/iron_destructor_hammer.json | 6 +- .../data/justhammers/recipes/iron_hammer.json | 6 +- .../recipes/iron_impact_hammer.json | 6 +- .../recipes/iron_reinforced_hammer.json | 6 +- .../iron_reinforced_impact_hammer.json | 6 +- .../recipes/netherite_destructor_hammer.json | 6 +- .../justhammers/recipes/netherite_hammer.json | 6 +- .../recipes/netherite_impact_hammer.json | 6 +- .../recipes/netherite_reinforced_hammer.json | 6 +- .../netherite_reinforced_impact_hammer.json | 6 +- .../justhammers/recipes/reinforced_core.json | 6 +- .../recipes/reinforced_impact_core.json | 6 +- .../recipes/stone_destructor_hammer.json | 6 +- .../justhammers/recipes/stone_hammer.json | 6 +- .../recipes/stone_impact_hammer.json | 6 +- .../recipes/stone_reinforced_hammer.json | 6 +- .../stone_reinforced_impact_hammer.json | 6 +- .../justhammers/fabric/DataGenerators.java | 183 ++++++++++++++++++ fabric/src/main/resources/fabric.mod.json | 3 + .../forge/data/DataGenerators.java | 181 ----------------- gradle.properties | 19 +- gradle/wrapper/gradle-wrapper.properties | 2 +- neoforge/build.gradle | 6 +- .../neoforge/HammersClientEvents.java | 4 +- .../ServerPlayerGameModeMixinNeoForge.java | 2 +- .../{mods.toml => neoforge.mods.toml} | 8 +- settings.gradle | 4 +- 111 files changed, 555 insertions(+), 627 deletions(-) delete mode 100644 common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e delete mode 100644 common/src/generated/resources/.cache/b31be46d105cf2224c912559a58cee2e49a31644 create mode 100644 fabric/src/main/generated/.cache/07268427ad4253551c9e53b40805557b8cfbf6d7 create mode 100644 fabric/src/main/generated/.cache/8dbef3b379be9bd0492523874bd3f3db07b6de2c rename common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 => fabric/src/main/generated/.cache/8f94e55bf28316c1b756497c2bd91d7acf749222 (53%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/lang/en_us.json (100%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/destructor_core.json (64%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/diamond_destructor_hammer.json (67%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/diamond_hammer.json (63%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/diamond_impact_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/diamond_reinforced_hammer.json (67%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json (68%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/gold_destructor_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/gold_hammer.json (62%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/gold_impact_hammer.json (65%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/gold_reinforced_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/gold_reinforced_impact_hammer.json (68%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/impact_core.json (62%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/iron_destructor_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/iron_hammer.json (62%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/iron_impact_hammer.json (65%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/iron_reinforced_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/iron_reinforced_impact_hammer.json (68%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/netherite_destructor_hammer.json (67%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/netherite_hammer.json (64%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/netherite_impact_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/netherite_reinforced_hammer.json (67%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json (69%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/reinforced_core.json (64%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/reinforced_impact_core.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/stone_destructor_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/stone_hammer.json (63%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/stone_impact_hammer.json (65%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/stone_reinforced_hammer.json (66%) rename {common/src/generated/resources => fabric/src/main/generated}/assets/justhammers/models/item/stone_reinforced_impact_hammer.json (68%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/destructor_core.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/diamond_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/gold_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/impact_core.json (81%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/iron_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/netherite_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/reinforced_core.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/stone_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json (84%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/destructor_core.json (84%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/diamond_destructor_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/diamond_hammer.json (77%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/diamond_impact_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/diamond_reinforced_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/diamond_reinforced_impact_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/gold_destructor_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/gold_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/gold_impact_hammer.json (80%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/gold_reinforced_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/gold_reinforced_impact_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/impact_core.json (84%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/iron_destructor_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/iron_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/iron_impact_hammer.json (80%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/iron_reinforced_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/iron_reinforced_impact_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/netherite_destructor_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/netherite_hammer.json (77%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/netherite_impact_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/netherite_reinforced_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/netherite_reinforced_impact_hammer.json (77%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/reinforced_core.json (83%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/reinforced_impact_core.json (82%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/stone_destructor_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/stone_hammer.json (77%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/stone_impact_hammer.json (79%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/stone_reinforced_hammer.json (78%) rename {common/src/generated/resources => fabric/src/main/generated}/data/justhammers/recipes/stone_reinforced_impact_hammer.json (77%) create mode 100644 fabric/src/main/java/pro/mikey/justhammers/fabric/DataGenerators.java delete mode 100644 forge/src/main/java/pro/mikey/justhammers/forge/data/DataGenerators.java rename neoforge/src/main/resources/META-INF/{mods.toml => neoforge.mods.toml} (84%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4dafa2b..bf80d73 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fcbbfff..34f4945 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9eb75..4614eb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Just Hammers Changelog -## [84.0.0] +## [20.6.0] ### Changed -- Ported to 1.20.4 +- Ported to 1.20.6 diff --git a/build.gradle b/build.gradle index a9fdf91..836e17a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id "architectury-plugin" version "3.4.151" - id "dev.architectury.loom" version "1.4.373" apply false + id "architectury-plugin" version "3.4-SNAPSHOT" + id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false id "me.modmuss50.mod-publish-plugin" version "0.4.5" } @@ -50,7 +50,7 @@ allprojects { tasks.withType(JavaCompile) { options.encoding = "UTF-8" - options.release = 17 + options.release = 21 } java { @@ -70,11 +70,11 @@ publishMods { modLoaders.add("fabric") } - def forgeOptions = publishOptions { - file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile } - displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}" - modLoaders.add("forge") - } +// def forgeOptions = publishOptions { +// file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile } +// displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}" +// modLoaders.add("forge") +// } def neoForge = publishOptions { file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile } @@ -104,12 +104,12 @@ publishMods { } } - curseforge("curseforgeForge") { - from(curseForgeOptions, forgeOptions) - requires { - slug = "architectury-api" - } - } +// curseforge("curseforgeForge") { +// from(curseForgeOptions, forgeOptions) +// requires { +// slug = "architectury-api" +// } +// } curseforge("curseforgeNeoForge") { from(curseForgeOptions, neoForge) @@ -129,12 +129,12 @@ publishMods { } } - modrinth("modrinthForge") { - from(modrinthOptions, forgeOptions) - requires { - slug = "architectury-api" - } - } +// modrinth("modrinthForge") { +// from(modrinthOptions, forgeOptions) +// requires { +// slug = "architectury-api" +// } +// } modrinth("modrinthNeoforge") { from(modrinthOptions, neoForge) @@ -144,9 +144,9 @@ publishMods { } github { - file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile } +// file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile } additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile } - additionalFiles.from project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile } + file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile } announcementTitle = "[${minecraft_version}] Just Hammers ${mod_version}" diff --git a/common/build.gradle b/common/build.gradle index 835fb75..ce2cdda 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -6,8 +6,6 @@ loom { accessWidenerPath = file("src/main/resources/justhammers.accesswidener") } -sourceSets.main.resources.srcDirs += file("src/generated/resources") - dependencies { modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" modApi "dev.architectury:architectury:${rootProject.architectury_version}" diff --git a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e deleted file mode 100644 index 13f97d6..0000000 --- a/common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ /dev/null @@ -1,59 +0,0 @@ -// 1.20.2 2023-12-24T22:49:00.897269 Recipes -22ca355cd8f7a6bb008d9847b87c7327bf3a5b12 data/justhammers/advancements/recipes/tools/destructor_core.json -97fa36207b40207cdeff9e469084010563ff127b data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json -1b8e24e0a096b8ff5718a8005a23d8f202b39466 data/justhammers/advancements/recipes/tools/diamond_hammer.json -664562d5d3a4b5fdd842591c427bf29623cb6dc3 data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json -aaaee398a8e84772de0c0b903a0f75d21cd944fa data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json -5a4312df7ea74b3ac866e15bf36e19024837ff5c data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json -9c78253911be34d4e206a5771aa797a445e852df data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json -a8240ad9524d5770c246f920fd635cac37754957 data/justhammers/advancements/recipes/tools/gold_hammer.json -e6a58263880acddecb13d30318fe641932d38d3d data/justhammers/advancements/recipes/tools/gold_impact_hammer.json -db3425eb2fba00a3d9d505a8ff14d0f1d55249d7 data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json -cfa26e54ecd1d41b4f1ac3c3825e68c352439367 data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json -62461846890b21c291ad1db39706bfa0c18f380b data/justhammers/advancements/recipes/tools/impact_core.json -f1035cba2e578d33adcbd120c383ca57acc883b0 data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json -b90bc2f1affbc088044ca53b3c670e48717bca1d data/justhammers/advancements/recipes/tools/iron_hammer.json -0d5004542481c8fa52140b5c9810b9d241f61d54 data/justhammers/advancements/recipes/tools/iron_impact_hammer.json -ede6c92857c9fe2625c0d6b2c0e298e25cd72ef4 data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json -77fd320cc0a52ceb7bd65bee20bccfa9f22fed70 data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json -6f35fe577d1dc392c5493e8abf7701b14de0626a data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json -b927e664a0dda0464117f3da0c94aedf076e54c2 data/justhammers/advancements/recipes/tools/netherite_hammer.json -45d8242a3f5ad267a57aeae41c9ccc050d83213f data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json -cd3e63c186098a4b5ffe9942c4844136e1daa03b data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json -a99a948f19ea33470073c72ec177318d678ad272 data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json -a09a7e43ba3b66d2ceaf979597ef40a9ef914b31 data/justhammers/advancements/recipes/tools/reinforced_core.json -e7db9187bfe68ce463926a32cd627a87b2b4f9c9 data/justhammers/advancements/recipes/tools/reinforced_impact_core.json -0af3a992ed78fc3dfcdc84009d50dfce4dab52d6 data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json -0b7c14a7a801fc0793515896e0c91eefe95deef7 data/justhammers/advancements/recipes/tools/stone_hammer.json -17ef850bbf756fbb6867ed47a4def34f249ef4cc data/justhammers/advancements/recipes/tools/stone_impact_hammer.json -a312d1e2663856f71e7a062437677a72de8e84c8 data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json -7c31b4c23cd63f18ed7a6c896fbbf4bb56c7d60d data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json -55aac7918d921745c7385041bc31356b982d611c data/justhammers/recipes/destructor_core.json -51a04d4b3c729c3273e079a5f554f9a9f71b86a2 data/justhammers/recipes/diamond_destructor_hammer.json -e6c4efb5297056641260dc90f1dfb5158bbc7400 data/justhammers/recipes/diamond_hammer.json -6c767f28d781cc65defc9bb5b101fb82cdf63d70 data/justhammers/recipes/diamond_impact_hammer.json -8e15449e3651ec1d5d951a3d192f4101feec2c55 data/justhammers/recipes/diamond_reinforced_hammer.json -3e485d66185448d6206cd371e0e900be1b72e46b data/justhammers/recipes/diamond_reinforced_impact_hammer.json -f73eaa11344d7509660625f45f00aaf3ab24411d data/justhammers/recipes/gold_destructor_hammer.json -7b2e2199df9cfb024b7c6dde2c435ff0e361de94 data/justhammers/recipes/gold_hammer.json -b66370929cf204d8bb20c53aee416381c07b0857 data/justhammers/recipes/gold_impact_hammer.json -7ab6b016bc397525ed9b0305d9be7247a5bf3d29 data/justhammers/recipes/gold_reinforced_hammer.json -61a826eb86bdb17dd0c51a05913233fea693d130 data/justhammers/recipes/gold_reinforced_impact_hammer.json -88efb8e799cd3596f23c546b4a0f1743227539e2 data/justhammers/recipes/impact_core.json -d06b8eefd79b361961e29ef263ad6876c63cbef8 data/justhammers/recipes/iron_destructor_hammer.json -5196500955f3ec958014fbafc678358e28460d4e data/justhammers/recipes/iron_hammer.json -39aca86398408d055100d259f0ec3b576e9b8522 data/justhammers/recipes/iron_impact_hammer.json -e46c8df9b56a5ab57127810d03f49c5fe5ca7bd0 data/justhammers/recipes/iron_reinforced_hammer.json -48436455245721da895e733c7e44b7e7476938d9 data/justhammers/recipes/iron_reinforced_impact_hammer.json -e92959468bc6e7548eaabec99d5fef0b1b57c4ce data/justhammers/recipes/netherite_destructor_hammer.json -9eb74a224eb70a844bf73dc16f1d40604c168ad0 data/justhammers/recipes/netherite_hammer.json -1281d485c5e0a151c1a103f8382b160419bd710e data/justhammers/recipes/netherite_impact_hammer.json -b513349e93678b3ce2dc523c2ba1817637968c48 data/justhammers/recipes/netherite_reinforced_hammer.json -59f3c3da1c9439aa0ed778cfe6932e9513ea7d13 data/justhammers/recipes/netherite_reinforced_impact_hammer.json -4644c297d63502e8dcdef80a835c9bae28448751 data/justhammers/recipes/reinforced_core.json -a7bdcf8508b0cdb31006ac806490ddded78cbc6c data/justhammers/recipes/reinforced_impact_core.json -016e77763901e9496b802e71d956294993b2579f data/justhammers/recipes/stone_destructor_hammer.json -baa24260e7ac67435333954acd17bc4144b4fae9 data/justhammers/recipes/stone_hammer.json -3d2495fe61131d11a3adfe6aa4ec2f36be10bb00 data/justhammers/recipes/stone_impact_hammer.json -1eb9ee4c2098731418d3c70be09d0151a97c6270 data/justhammers/recipes/stone_reinforced_hammer.json -4dc62532a8ba400236a9dc93bfad9f2699bd71f5 data/justhammers/recipes/stone_reinforced_impact_hammer.json diff --git a/common/src/generated/resources/.cache/b31be46d105cf2224c912559a58cee2e49a31644 b/common/src/generated/resources/.cache/b31be46d105cf2224c912559a58cee2e49a31644 deleted file mode 100644 index 96b956e..0000000 --- a/common/src/generated/resources/.cache/b31be46d105cf2224c912559a58cee2e49a31644 +++ /dev/null @@ -1,30 +0,0 @@ -// 1.20.2 2023-12-24T22:49:00.894037 Item Models: justhammers -c7b59ae6e57179b6bb7fc72d53637677150f3693 assets/justhammers/models/item/destructor_core.json -ecb4259b8cfc86898fffad8ee038de7f20c45429 assets/justhammers/models/item/diamond_destructor_hammer.json -1e5510305d71a3b4eb623252a3fc49985bb9c1fe assets/justhammers/models/item/diamond_hammer.json -a22457cf043b6159fa7add5d7c4d5261fd153a96 assets/justhammers/models/item/diamond_impact_hammer.json -6a01201fd726b07a8e922be9c1ef166912785fef assets/justhammers/models/item/diamond_reinforced_hammer.json -c369f0809c2d052fd0f0035c471de0ce604bf514 assets/justhammers/models/item/diamond_reinforced_impact_hammer.json -6471f9d9ad496ce50a0ac3a7a81b983794730854 assets/justhammers/models/item/gold_destructor_hammer.json -be2e2b21b0efa819cecf0dfe4455d2bf9c1bae61 assets/justhammers/models/item/gold_hammer.json -18289c73818e70bbb9022c86b0ac104f586a6da8 assets/justhammers/models/item/gold_impact_hammer.json -0a1b842f549519a8a93c8d7ddf2991f4f9c46666 assets/justhammers/models/item/gold_reinforced_hammer.json -435ab4bc67cb3396f6cee1a4acacceae90cccd4d assets/justhammers/models/item/gold_reinforced_impact_hammer.json -79c4b2c3efe296344f0e1de0c8dba98c449b775b assets/justhammers/models/item/impact_core.json -209d68466503f8de616ec8a0fb3b8eea38c4ec2d assets/justhammers/models/item/iron_destructor_hammer.json -99c96c721a88fe2b1e44c721c0d4f8cae5c568c3 assets/justhammers/models/item/iron_hammer.json -871b486e71d948e25854d62f2ba6c0231cbc921b assets/justhammers/models/item/iron_impact_hammer.json -f09440affe732c1ce3e9fc8860d19380e13381af assets/justhammers/models/item/iron_reinforced_hammer.json -7c2a0ad25e7591a7236de872e9063a616240799b assets/justhammers/models/item/iron_reinforced_impact_hammer.json -187ca0538543f4b4207a6a48ae433a347c993543 assets/justhammers/models/item/netherite_destructor_hammer.json -39172ed7e621d3dae002c0cc8a05f8531ab9a83e assets/justhammers/models/item/netherite_hammer.json -786ff93f4a209b589222f8b04e9bebd90efbb52d assets/justhammers/models/item/netherite_impact_hammer.json -fe12e2a75a65763b5abfe7bc4a590c06dcb5c729 assets/justhammers/models/item/netherite_reinforced_hammer.json -c6d2f0f8c0a3ef8ec7e72fc4a66bdfb7f2b09a11 assets/justhammers/models/item/netherite_reinforced_impact_hammer.json -d646e86a5fb95e954805b7f0fbfc66f875b175c2 assets/justhammers/models/item/reinforced_core.json -7c67f7538df3eba164bf381656c4c609e05c655a assets/justhammers/models/item/reinforced_impact_core.json -b271d5334779ed7168a60128122e32020ba2e9be assets/justhammers/models/item/stone_destructor_hammer.json -a206fec3126dedfd18d855815d596548f9aa6782 assets/justhammers/models/item/stone_hammer.json -859daf3a5f6e27c59861a11de7a6a07b358c58ef assets/justhammers/models/item/stone_impact_hammer.json -cc6ba727edfad7f6baae5dbcf19ab00111744fde assets/justhammers/models/item/stone_reinforced_hammer.json -e1753872b6b236c5205c7108c8430a7b746f9dc6 assets/justhammers/models/item/stone_reinforced_impact_hammer.json diff --git a/common/src/main/java/pro/mikey/justhammers/HammerItem.java b/common/src/main/java/pro/mikey/justhammers/HammerItem.java index 35af293..03ab03a 100644 --- a/common/src/main/java/pro/mikey/justhammers/HammerItem.java +++ b/common/src/main/java/pro/mikey/justhammers/HammerItem.java @@ -13,12 +13,14 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.*; +import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.HashSet; @@ -31,18 +33,19 @@ public class HammerItem extends PickaxeItem { private final int depth; private final int radius; - private TagKey blocks; public HammerItem(Tier tier, int radius, int depth, int level) { - super(tier, 1, -2.8f, HammerItems.DEFAULT_PROPERTIES.durability(computeDurability(tier, level))); + super(new WrappedTier(tier, computeDurability(tier, level)), + HammerItems.DEFAULT_PROPERTIES + .durability(computeDurability(tier, level)) + .attributes(PickaxeItem.createAttributes(tier, 1, -2.8f))); - this.blocks = BlockTags.MINEABLE_WITH_PICKAXE; this.depth = depth; this.radius = radius; } @Override - public void appendHoverText(ItemStack itemStack, @Nullable Level level, List list, TooltipFlag tooltipFlag) { + public void appendHoverText(ItemStack itemStack, TooltipContext tooltipContext, List list, TooltipFlag tooltipFlag) { list.add(Component.translatable("justhammers.tooltip.size", this.radius, this.radius, this.depth).withStyle(ChatFormatting.GRAY)); int damage = itemStack.getDamageValue(); @@ -106,30 +109,8 @@ public float getDestroySpeed(ItemStack itemStack, BlockState blockState) { return super.getDestroySpeed(itemStack, blockState); } - // Called on fabric - @Override - public boolean isCorrectToolForDrops(BlockState blockState) { - return actualIsCorrectToolForDrops(blockState); - } - - // Called on Forge - public boolean isCorrectToolForDrops(ItemStack stack, BlockState state) { - return actualIsCorrectToolForDrops(state); - } - - public boolean actualIsCorrectToolForDrops(BlockState state) { - int i = this.getTier().getLevel(); - if (i < 3 && state.is(BlockTags.NEEDS_DIAMOND_TOOL)) { - return false; - } else if (i < 2 && state.is(BlockTags.NEEDS_IRON_TOOL)) { - return false; - } else { - return (i >= 1 || !state.is(BlockTags.NEEDS_STONE_TOOL)) && state.is(this.blocks); - } - } - public void causeAoe(Level level, BlockPos pos, BlockState state, ItemStack hammer, LivingEntity livingEntity) { - if (!(livingEntity instanceof ServerPlayer player)) return; + if (!(livingEntity instanceof ServerPlayer)) return; if (level.isClientSide || state.getDestroySpeed(level, pos) == 0.0F) { return; @@ -147,18 +128,6 @@ public void causeAoe(Level level, BlockPos pos, BlockState state, ItemStack hamm } this.findAndBreakNearBlocks(blockHitResult, pos, hammer, level, livingEntity); - - // If the hammer is within 5% of durability remaining, warn the player - if (hammer.getDamageValue() >= hammer.getMaxDamage() * 0.95) { - if (!hammer.getOrCreateTag().contains("has_been_warned")) { - player.sendSystemMessage(Component.translatable("justhammers.tooltip.durability_warning").withStyle(ChatFormatting.RED), true); - hammer.getOrCreateTag().putBoolean("has_been_warned", true); - } - } else { - if (hammer.getOrCreateTag().contains("has_been_warned")) { - hammer.getOrCreateTag().remove("has_been_warned"); - } - } } public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemStack hammerStack, Level level, LivingEntity livingEntity) { @@ -189,7 +158,8 @@ public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemS } // Skips any blocks that require a higher tier hammer - if (!actualIsCorrectToolForDrops(targetState)) { + var incorrectBlocksForDrops = this.getTier().getIncorrectBlocksForDrops(); + if (targetState.is(incorrectBlocksForDrops)) { continue; } @@ -214,9 +184,7 @@ public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemS } if (damage != 0 && !player.isCreative()) { - hammerStack.hurtAndBreak(damage, livingEntity, (livingEntityx) -> { - livingEntityx.broadcastBreakEvent(EquipmentSlot.MAINHAND); - }); + hammerStack.hurtAndBreak(damage, livingEntity, EquipmentSlot.MAINHAND); } } @@ -250,4 +218,39 @@ public int getDepth() { public int getRadius() { return radius; } + + private record WrappedTier( + Tier tier, + int durability + ) implements Tier { + @Override + public int getUses() { + return durability; + } + + @Override + public float getSpeed() { + return tier.getSpeed(); + } + + @Override + public float getAttackDamageBonus() { + return tier.getAttackDamageBonus(); + } + + @Override + public @NotNull TagKey getIncorrectBlocksForDrops() { + return tier.getIncorrectBlocksForDrops(); + } + + @Override + public int getEnchantmentValue() { + return tier.getEnchantmentValue(); + } + + @Override + public @NotNull Ingredient getRepairIngredient() { + return tier.getRepairIngredient(); + } + } } diff --git a/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java b/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java index b9e438a..255731d 100644 --- a/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java +++ b/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java @@ -59,7 +59,8 @@ public static void render(ClientLevel world, Camera camera, float v, PoseStack p // Get the block at the pos var block = world.getBlockState(blockPos); - if (!hammer.actualIsCorrectToolForDrops(block) || block.is(HammerTags.HAMMER_NO_SMASHY)) { + var incorrectFor = hammer.getTier().getIncorrectBlocksForDrops(); + if (block.is(incorrectFor) || block.is(HammerTags.HAMMER_NO_SMASHY)) { return; } diff --git a/fabric/build.gradle b/fabric/build.gradle index 86a6860..3753488 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -11,6 +11,10 @@ loom { accessWidenerPath = project(":common").loom.accessWidenerPath } +fabricApi { + configureDataGeneration() +} + configurations { common shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. @@ -56,6 +60,7 @@ remapJar { jar { setArchiveClassifier "dev" + exclude 'pro/mikey/justhammers/fabric/DataGenerators.class' } sourcesJar { diff --git a/fabric/src/main/generated/.cache/07268427ad4253551c9e53b40805557b8cfbf6d7 b/fabric/src/main/generated/.cache/07268427ad4253551c9e53b40805557b8cfbf6d7 new file mode 100644 index 0000000..c6e1bb2 --- /dev/null +++ b/fabric/src/main/generated/.cache/07268427ad4253551c9e53b40805557b8cfbf6d7 @@ -0,0 +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 diff --git a/fabric/src/main/generated/.cache/8dbef3b379be9bd0492523874bd3f3db07b6de2c b/fabric/src/main/generated/.cache/8dbef3b379be9bd0492523874bd3f3db07b6de2c new file mode 100644 index 0000000..ea96947 --- /dev/null +++ b/fabric/src/main/generated/.cache/8dbef3b379be9bd0492523874bd3f3db07b6de2c @@ -0,0 +1,30 @@ +// 1.20.6 2024-06-10T17:19:33.583904 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 +4730a022a4d8dfb67bee272d77426874879267d3 assets/justhammers/models/item/gold_impact_hammer.json +fd472929232a67b57fa7009eb53de0e6544f7144 assets/justhammers/models/item/stone_reinforced_hammer.json +498a336eda3834f7aa46a90f1fa9a612d83ed12e assets/justhammers/models/item/stone_reinforced_impact_hammer.json +c0c3dc0e15f860caefff1ff8e04a5fa3588e5c2a assets/justhammers/models/item/destructor_core.json +c490ecf05c1991eafc97285740fd0e5db482b4fd assets/justhammers/models/item/diamond_reinforced_hammer.json +639f6ed7332a683563dd98d8337b8f38fc82d06e assets/justhammers/models/item/impact_core.json +e77428af11f7063ea70069a900a6f1ee4183489a assets/justhammers/models/item/iron_reinforced_impact_hammer.json +d22bdffa19605028dd25f7d392e446bf05644c84 assets/justhammers/models/item/netherite_reinforced_hammer.json +794af136f2473ef3fdb0953af5302bf2442d7762 assets/justhammers/models/item/netherite_impact_hammer.json +5bbc10837e44c2e8e04bfc7e3a858b208ec238d4 assets/justhammers/models/item/gold_reinforced_hammer.json +ecdc2859d4aa89b1667a03296af096b284523ce3 assets/justhammers/models/item/netherite_hammer.json +98fb81407ac6d396440e8e35e798088515e22619 assets/justhammers/models/item/gold_reinforced_impact_hammer.json +7b5b4fe8a6906b0ed86b68bd733b97e91570186c assets/justhammers/models/item/gold_hammer.json +29ec63aa12d6d162936a8474ff357e7b48eb24c3 assets/justhammers/models/item/stone_impact_hammer.json +2c95947dc74e5504f297136839a0404088749632 assets/justhammers/models/item/gold_destructor_hammer.json +a387b4097cfd712aad40265e47e5ffdb07a9aeff assets/justhammers/models/item/netherite_reinforced_impact_hammer.json +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 +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 +7c1dd1b73fe53dfe0b8d7720a447ef52a88fb2c6 assets/justhammers/models/item/stone_hammer.json +b5d16a031f65246569b71bc4e2af0dbf56cca328 assets/justhammers/models/item/diamond_reinforced_impact_hammer.json diff --git a/common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/fabric/src/main/generated/.cache/8f94e55bf28316c1b756497c2bd91d7acf749222 similarity index 53% rename from common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 rename to fabric/src/main/generated/.cache/8f94e55bf28316c1b756497c2bd91d7acf749222 index a493a49..d62098d 100644 --- a/common/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/fabric/src/main/generated/.cache/8f94e55bf28316c1b756497c2bd91d7acf749222 @@ -1,2 +1,2 @@ -// 1.20.2 2023-12-24T22:49:00.898273 Languages: en_us +// 1.20.6 2024-06-10T17:19:33.583291 Just Hammers/Language (en_us) 35eb489b75622d3a6de2a4646dd60da205f971c0 assets/justhammers/lang/en_us.json diff --git a/common/src/generated/resources/assets/justhammers/lang/en_us.json b/fabric/src/main/generated/assets/justhammers/lang/en_us.json similarity index 100% rename from common/src/generated/resources/assets/justhammers/lang/en_us.json rename to fabric/src/main/generated/assets/justhammers/lang/en_us.json diff --git a/common/src/generated/resources/assets/justhammers/models/item/destructor_core.json b/fabric/src/main/generated/assets/justhammers/models/item/destructor_core.json similarity index 64% rename from common/src/generated/resources/assets/justhammers/models/item/destructor_core.json rename to fabric/src/main/generated/assets/justhammers/models/item/destructor_core.json index ed9825e..365da0d 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/destructor_core.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/destructor_core.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/destructor_core" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/diamond_destructor_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/diamond_destructor_hammer.json similarity index 67% rename from common/src/generated/resources/assets/justhammers/models/item/diamond_destructor_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/diamond_destructor_hammer.json index d631571..5af9ac7 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/diamond_destructor_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/diamond_destructor_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/diamond_destructor_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/diamond_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/diamond_hammer.json similarity index 63% rename from common/src/generated/resources/assets/justhammers/models/item/diamond_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/diamond_hammer.json index b225d41..6db9e7c 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/diamond_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/diamond_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/diamond_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/diamond_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/diamond_impact_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/diamond_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/diamond_impact_hammer.json index bb32bec..9990adb 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/diamond_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/diamond_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/diamond_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/diamond_reinforced_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/diamond_reinforced_hammer.json similarity index 67% rename from common/src/generated/resources/assets/justhammers/models/item/diamond_reinforced_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/diamond_reinforced_hammer.json index 9543663..6490d6b 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/diamond_reinforced_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/diamond_reinforced_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/diamond_reinforced_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json similarity index 68% rename from common/src/generated/resources/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json index 7c4eea4..680265b 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/diamond_reinforced_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/diamond_reinforced_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/gold_destructor_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/gold_destructor_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/gold_destructor_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/gold_destructor_hammer.json index 1f36752..4514ef6 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/gold_destructor_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/gold_destructor_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/gold_destructor_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/gold_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/gold_hammer.json similarity index 62% rename from common/src/generated/resources/assets/justhammers/models/item/gold_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/gold_hammer.json index 52b047c..b544b29 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/gold_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/gold_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/gold_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/gold_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/gold_impact_hammer.json similarity index 65% rename from common/src/generated/resources/assets/justhammers/models/item/gold_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/gold_impact_hammer.json index 6e68431..87bbe0f 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/gold_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/gold_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/gold_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/gold_reinforced_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/gold_reinforced_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/gold_reinforced_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/gold_reinforced_hammer.json index 2a9987b..b0f9c5d 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/gold_reinforced_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/gold_reinforced_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/gold_reinforced_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/gold_reinforced_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/gold_reinforced_impact_hammer.json similarity index 68% rename from common/src/generated/resources/assets/justhammers/models/item/gold_reinforced_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/gold_reinforced_impact_hammer.json index c862224..f453e27 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/gold_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/gold_reinforced_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/gold_reinforced_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/impact_core.json b/fabric/src/main/generated/assets/justhammers/models/item/impact_core.json similarity index 62% rename from common/src/generated/resources/assets/justhammers/models/item/impact_core.json rename to fabric/src/main/generated/assets/justhammers/models/item/impact_core.json index 3764dd3..fb4d5a7 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/impact_core.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/impact_core.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/impact_core" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/iron_destructor_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/iron_destructor_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/iron_destructor_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/iron_destructor_hammer.json index ebab076..4e4bc71 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/iron_destructor_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/iron_destructor_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/iron_destructor_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/iron_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/iron_hammer.json similarity index 62% rename from common/src/generated/resources/assets/justhammers/models/item/iron_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/iron_hammer.json index 66759cc..1db9b73 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/iron_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/iron_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/iron_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/iron_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/iron_impact_hammer.json similarity index 65% rename from common/src/generated/resources/assets/justhammers/models/item/iron_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/iron_impact_hammer.json index cd8893e..2a20747 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/iron_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/iron_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/iron_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/iron_reinforced_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/iron_reinforced_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/iron_reinforced_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/iron_reinforced_hammer.json index 5f73d25..4578aab 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/iron_reinforced_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/iron_reinforced_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/iron_reinforced_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/iron_reinforced_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/iron_reinforced_impact_hammer.json similarity index 68% rename from common/src/generated/resources/assets/justhammers/models/item/iron_reinforced_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/iron_reinforced_impact_hammer.json index 2e98ea9..654ab54 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/iron_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/iron_reinforced_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/iron_reinforced_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/netherite_destructor_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/netherite_destructor_hammer.json similarity index 67% rename from common/src/generated/resources/assets/justhammers/models/item/netherite_destructor_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/netherite_destructor_hammer.json index afb7568..389172c 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/netherite_destructor_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/netherite_destructor_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/netherite_destructor_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/netherite_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/netherite_hammer.json similarity index 64% rename from common/src/generated/resources/assets/justhammers/models/item/netherite_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/netherite_hammer.json index a8c0997..90503e2 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/netherite_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/netherite_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/netherite_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/netherite_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/netherite_impact_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/netherite_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/netherite_impact_hammer.json index d5190e1..8f39cc4 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/netherite_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/netherite_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/netherite_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/netherite_reinforced_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/netherite_reinforced_hammer.json similarity index 67% rename from common/src/generated/resources/assets/justhammers/models/item/netherite_reinforced_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/netherite_reinforced_hammer.json index 50afb09..5ae8f69 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/netherite_reinforced_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/netherite_reinforced_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/netherite_reinforced_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json similarity index 69% rename from common/src/generated/resources/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json index 07505ce..ab28b80 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/netherite_reinforced_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/netherite_reinforced_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/reinforced_core.json b/fabric/src/main/generated/assets/justhammers/models/item/reinforced_core.json similarity index 64% rename from common/src/generated/resources/assets/justhammers/models/item/reinforced_core.json rename to fabric/src/main/generated/assets/justhammers/models/item/reinforced_core.json index 3cf3e0b..69048e1 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/reinforced_core.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/reinforced_core.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/reinforced_core" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/reinforced_impact_core.json b/fabric/src/main/generated/assets/justhammers/models/item/reinforced_impact_core.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/reinforced_impact_core.json rename to fabric/src/main/generated/assets/justhammers/models/item/reinforced_impact_core.json index 4e75c98..8134472 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/reinforced_impact_core.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/reinforced_impact_core.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/reinforced_impact_core" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/stone_destructor_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/stone_destructor_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/stone_destructor_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/stone_destructor_hammer.json index 782fdff..65cb211 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/stone_destructor_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/stone_destructor_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/stone_destructor_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/stone_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/stone_hammer.json similarity index 63% rename from common/src/generated/resources/assets/justhammers/models/item/stone_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/stone_hammer.json index 5751b48..0a9f26e 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/stone_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/stone_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/stone_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/stone_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/stone_impact_hammer.json similarity index 65% rename from common/src/generated/resources/assets/justhammers/models/item/stone_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/stone_impact_hammer.json index 3a76a1f..52f23ac 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/stone_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/stone_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/stone_impact_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/stone_reinforced_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/stone_reinforced_hammer.json similarity index 66% rename from common/src/generated/resources/assets/justhammers/models/item/stone_reinforced_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/stone_reinforced_hammer.json index 2730a06..d7a93b8 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/stone_reinforced_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/stone_reinforced_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/stone_reinforced_hammer" } diff --git a/common/src/generated/resources/assets/justhammers/models/item/stone_reinforced_impact_hammer.json b/fabric/src/main/generated/assets/justhammers/models/item/stone_reinforced_impact_hammer.json similarity index 68% rename from common/src/generated/resources/assets/justhammers/models/item/stone_reinforced_impact_hammer.json rename to fabric/src/main/generated/assets/justhammers/models/item/stone_reinforced_impact_hammer.json index 6b19d35..891644d 100644 --- a/common/src/generated/resources/assets/justhammers/models/item/stone_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/assets/justhammers/models/item/stone_reinforced_impact_hammer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "justhammers:item/stone_reinforced_impact_hammer" } diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/destructor_core.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/destructor_core.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/destructor_core.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/destructor_core.json index d8bc673..6907eb0 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/destructor_core.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/destructor_core.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "justhammers:stone_hammer" - ] + "items": "justhammers:stone_hammer" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:destructor_core" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json index 4642ecd..c75357f 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_destructor_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diamond_block" - ] + "items": "minecraft:diamond_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:diamond_destructor_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_hammer.json index 8e6bf53..fc10b03 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diamond" - ] + "items": "minecraft:diamond" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:diamond_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json index da85cc5..84b4730 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diamond_block" - ] + "items": "minecraft:diamond_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:diamond_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json index c469b6b..ab2d39f 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_reinforced_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diamond_block" - ] + "items": "minecraft:diamond_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:diamond_reinforced_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json index 58f4f6c..571f995 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/diamond_reinforced_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:diamond_block" - ] + "items": "minecraft:diamond_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:diamond_reinforced_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json index c7712d2..c2a5307 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_destructor_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gold_block" - ] + "items": "minecraft:gold_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:gold_destructor_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_hammer.json index ffb7fbf..b2b594f 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gold_ingot" - ] + "items": "minecraft:gold_ingot" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:gold_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json index 09753dd..1e1212d 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gold_block" - ] + "items": "minecraft:gold_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:gold_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json index c485461..b0b4a82 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_reinforced_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gold_block" - ] + "items": "minecraft:gold_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:gold_reinforced_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json index f35e3af..0d1925d 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/gold_reinforced_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:gold_block" - ] + "items": "minecraft:gold_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:gold_reinforced_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/impact_core.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/impact_core.json similarity index 81% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/impact_core.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/impact_core.json index b07b672..6194294 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/impact_core.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/impact_core.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "justhammers:stone_hammer" - ] + "items": "justhammers:stone_hammer" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:impact_core" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json index 9f7e477..65ec146 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_destructor_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_block" - ] + "items": "minecraft:iron_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:iron_destructor_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_hammer.json index 1d3980c..b980e45 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_ingot" - ] + "items": "minecraft:iron_ingot" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:iron_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json index a3f6b3d..f062abc 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_block" - ] + "items": "minecraft:iron_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:iron_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json index 6a34984..a19db6e 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_reinforced_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_block" - ] + "items": "minecraft:iron_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:iron_reinforced_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json index a3d3da7..40b1819 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/iron_reinforced_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:iron_block" - ] + "items": "minecraft:iron_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:iron_reinforced_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json index 3294253..25cd307 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_destructor_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:netherite_block" - ] + "items": "minecraft:netherite_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:netherite_destructor_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_hammer.json index 9265fd5..8676633 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:netherite_ingot" - ] + "items": "minecraft:netherite_ingot" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:netherite_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json index 64ecf52..60e1477 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:netherite_block" - ] + "items": "minecraft:netherite_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:netherite_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json index 685b3b3..29d7e56 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_reinforced_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:netherite_block" - ] + "items": "minecraft:netherite_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:netherite_reinforced_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json index 36cb4aa..0fd074b 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/netherite_reinforced_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:netherite_block" - ] + "items": "minecraft:netherite_block" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:netherite_reinforced_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/reinforced_core.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/reinforced_core.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/reinforced_core.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/reinforced_core.json index 6b02d1f..78832e4 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/reinforced_core.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/reinforced_core.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "justhammers:stone_hammer" - ] + "items": "justhammers:stone_hammer" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:reinforced_core" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json similarity index 82% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json index 84b16e8..5f65ef7 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/reinforced_impact_core.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "justhammers:stone_hammer" - ] + "items": "justhammers:stone_hammer" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:reinforced_impact_core" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json index 7038cee..39807c3 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_destructor_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:stone_destructor_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_hammer.json index 5faee60..47064bb 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:stone_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json index 0a96050..95d027a 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:stone_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json similarity index 83% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json index f32890d..9e55fbb 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_reinforced_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:stone_reinforced_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json similarity index 84% rename from common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json index ec2b4c7..19e4243 100644 --- a/common/src/generated/resources/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/advancements/recipes/tools/stone_reinforced_impact_hammer.json @@ -5,9 +5,7 @@ "conditions": { "items": [ { - "items": [ - "minecraft:stone" - ] + "items": "minecraft:stone" } ] }, @@ -30,6 +28,5 @@ "recipes": [ "justhammers:stone_reinforced_impact_hammer" ] - }, - "sends_telemetry_event": false + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/destructor_core.json b/fabric/src/main/generated/data/justhammers/recipes/destructor_core.json similarity index 84% rename from common/src/generated/resources/data/justhammers/recipes/destructor_core.json rename to fabric/src/main/generated/data/justhammers/recipes/destructor_core.json index f44744f..e415dbb 100644 --- a/common/src/generated/resources/data/justhammers/recipes/destructor_core.json +++ b/fabric/src/main/generated/data/justhammers/recipes/destructor_core.json @@ -21,7 +21,7 @@ "aaa" ], "result": { - "item": "justhammers:destructor_core" - }, - "show_notification": true + "count": 1, + "id": "justhammers:destructor_core" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/diamond_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/diamond_destructor_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/diamond_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/diamond_destructor_hammer.json index a1b3172..9f74092 100644 --- a/common/src/generated/resources/data/justhammers/recipes/diamond_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/diamond_destructor_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:diamond_destructor_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:diamond_destructor_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/diamond_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/diamond_hammer.json similarity index 77% rename from common/src/generated/resources/data/justhammers/recipes/diamond_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/diamond_hammer.json index 446346b..ea31d0e 100644 --- a/common/src/generated/resources/data/justhammers/recipes/diamond_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/diamond_hammer.json @@ -15,7 +15,7 @@ " b " ], "result": { - "item": "justhammers:diamond_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:diamond_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/diamond_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/diamond_impact_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/diamond_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/diamond_impact_hammer.json index f81507a..b668545 100644 --- a/common/src/generated/resources/data/justhammers/recipes/diamond_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/diamond_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:diamond_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:diamond_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/diamond_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/diamond_reinforced_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/diamond_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/diamond_reinforced_hammer.json index 1f88e35..88c66a1 100644 --- a/common/src/generated/resources/data/justhammers/recipes/diamond_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/diamond_reinforced_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:diamond_reinforced_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:diamond_reinforced_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/diamond_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/diamond_reinforced_impact_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/diamond_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/diamond_reinforced_impact_hammer.json index 6619c09..6fd88d5 100644 --- a/common/src/generated/resources/data/justhammers/recipes/diamond_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/diamond_reinforced_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:diamond_reinforced_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:diamond_reinforced_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/gold_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/gold_destructor_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/gold_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/gold_destructor_hammer.json index b75cfd0..8300ef2 100644 --- a/common/src/generated/resources/data/justhammers/recipes/gold_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/gold_destructor_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:gold_destructor_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:gold_destructor_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/gold_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/gold_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/gold_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/gold_hammer.json index ff83aff..74256d3 100644 --- a/common/src/generated/resources/data/justhammers/recipes/gold_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/gold_hammer.json @@ -15,7 +15,7 @@ " b " ], "result": { - "item": "justhammers:gold_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:gold_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/gold_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/gold_impact_hammer.json similarity index 80% rename from common/src/generated/resources/data/justhammers/recipes/gold_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/gold_impact_hammer.json index cf148d8..6160adc 100644 --- a/common/src/generated/resources/data/justhammers/recipes/gold_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/gold_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:gold_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:gold_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/gold_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/gold_reinforced_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/gold_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/gold_reinforced_hammer.json index 50102eb..775542e 100644 --- a/common/src/generated/resources/data/justhammers/recipes/gold_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/gold_reinforced_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:gold_reinforced_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:gold_reinforced_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/gold_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/gold_reinforced_impact_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/gold_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/gold_reinforced_impact_hammer.json index 6912c74..8da4217 100644 --- a/common/src/generated/resources/data/justhammers/recipes/gold_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/gold_reinforced_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:gold_reinforced_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:gold_reinforced_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/impact_core.json b/fabric/src/main/generated/data/justhammers/recipes/impact_core.json similarity index 84% rename from common/src/generated/resources/data/justhammers/recipes/impact_core.json rename to fabric/src/main/generated/data/justhammers/recipes/impact_core.json index be5b02c..7c12240 100644 --- a/common/src/generated/resources/data/justhammers/recipes/impact_core.json +++ b/fabric/src/main/generated/data/justhammers/recipes/impact_core.json @@ -21,7 +21,7 @@ "aaa" ], "result": { - "item": "justhammers:impact_core" - }, - "show_notification": true + "count": 1, + "id": "justhammers:impact_core" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/iron_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/iron_destructor_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/iron_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/iron_destructor_hammer.json index 4732d2b..7e25623 100644 --- a/common/src/generated/resources/data/justhammers/recipes/iron_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/iron_destructor_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:iron_destructor_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:iron_destructor_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/iron_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/iron_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/iron_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/iron_hammer.json index 644d1ad..7ad459c 100644 --- a/common/src/generated/resources/data/justhammers/recipes/iron_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/iron_hammer.json @@ -15,7 +15,7 @@ " b " ], "result": { - "item": "justhammers:iron_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:iron_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/iron_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/iron_impact_hammer.json similarity index 80% rename from common/src/generated/resources/data/justhammers/recipes/iron_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/iron_impact_hammer.json index 8060005..0b476b0 100644 --- a/common/src/generated/resources/data/justhammers/recipes/iron_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/iron_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:iron_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:iron_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/iron_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/iron_reinforced_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/iron_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/iron_reinforced_hammer.json index b8691de..83a535b 100644 --- a/common/src/generated/resources/data/justhammers/recipes/iron_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/iron_reinforced_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:iron_reinforced_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:iron_reinforced_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/iron_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/iron_reinforced_impact_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/iron_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/iron_reinforced_impact_hammer.json index ad86fb9..6cfe99b 100644 --- a/common/src/generated/resources/data/justhammers/recipes/iron_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/iron_reinforced_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:iron_reinforced_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:iron_reinforced_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/netherite_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/netherite_destructor_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/netherite_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/netherite_destructor_hammer.json index 3795586..7713661 100644 --- a/common/src/generated/resources/data/justhammers/recipes/netherite_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/netherite_destructor_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:netherite_destructor_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:netherite_destructor_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/netherite_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/netherite_hammer.json similarity index 77% rename from common/src/generated/resources/data/justhammers/recipes/netherite_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/netherite_hammer.json index f9d8ddf..ad5b2b3 100644 --- a/common/src/generated/resources/data/justhammers/recipes/netherite_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/netherite_hammer.json @@ -15,7 +15,7 @@ " b " ], "result": { - "item": "justhammers:netherite_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:netherite_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/netherite_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/netherite_impact_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/netherite_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/netherite_impact_hammer.json index 56467a8..318c7c1 100644 --- a/common/src/generated/resources/data/justhammers/recipes/netherite_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/netherite_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:netherite_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:netherite_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/netherite_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/netherite_reinforced_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/netherite_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/netherite_reinforced_hammer.json index b305ffd..02a1327 100644 --- a/common/src/generated/resources/data/justhammers/recipes/netherite_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/netherite_reinforced_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:netherite_reinforced_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:netherite_reinforced_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/netherite_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/netherite_reinforced_impact_hammer.json similarity index 77% rename from common/src/generated/resources/data/justhammers/recipes/netherite_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/netherite_reinforced_impact_hammer.json index 30dc890..a111b95 100644 --- a/common/src/generated/resources/data/justhammers/recipes/netherite_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/netherite_reinforced_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:netherite_reinforced_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:netherite_reinforced_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/reinforced_core.json b/fabric/src/main/generated/data/justhammers/recipes/reinforced_core.json similarity index 83% rename from common/src/generated/resources/data/justhammers/recipes/reinforced_core.json rename to fabric/src/main/generated/data/justhammers/recipes/reinforced_core.json index 68e3aef..db5a8f6 100644 --- a/common/src/generated/resources/data/justhammers/recipes/reinforced_core.json +++ b/fabric/src/main/generated/data/justhammers/recipes/reinforced_core.json @@ -21,7 +21,7 @@ "aaa" ], "result": { - "item": "justhammers:reinforced_core" - }, - "show_notification": true + "count": 1, + "id": "justhammers:reinforced_core" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/reinforced_impact_core.json b/fabric/src/main/generated/data/justhammers/recipes/reinforced_impact_core.json similarity index 82% rename from common/src/generated/resources/data/justhammers/recipes/reinforced_impact_core.json rename to fabric/src/main/generated/data/justhammers/recipes/reinforced_impact_core.json index 1f66cf3..99c9351 100644 --- a/common/src/generated/resources/data/justhammers/recipes/reinforced_impact_core.json +++ b/fabric/src/main/generated/data/justhammers/recipes/reinforced_impact_core.json @@ -21,7 +21,7 @@ "aaa" ], "result": { - "item": "justhammers:reinforced_impact_core" - }, - "show_notification": true + "count": 1, + "id": "justhammers:reinforced_impact_core" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/stone_destructor_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/stone_destructor_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/stone_destructor_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/stone_destructor_hammer.json index c7ef645..7c57002 100644 --- a/common/src/generated/resources/data/justhammers/recipes/stone_destructor_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/stone_destructor_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:stone_destructor_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:stone_destructor_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/stone_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/stone_hammer.json similarity index 77% rename from common/src/generated/resources/data/justhammers/recipes/stone_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/stone_hammer.json index cf5d7f7..1214be9 100644 --- a/common/src/generated/resources/data/justhammers/recipes/stone_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/stone_hammer.json @@ -15,7 +15,7 @@ " b " ], "result": { - "item": "justhammers:stone_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:stone_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/stone_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/stone_impact_hammer.json similarity index 79% rename from common/src/generated/resources/data/justhammers/recipes/stone_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/stone_impact_hammer.json index d72649e..6de1b24 100644 --- a/common/src/generated/resources/data/justhammers/recipes/stone_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/stone_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:stone_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:stone_impact_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/stone_reinforced_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/stone_reinforced_hammer.json similarity index 78% rename from common/src/generated/resources/data/justhammers/recipes/stone_reinforced_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/stone_reinforced_hammer.json index 15be4c5..f332239 100644 --- a/common/src/generated/resources/data/justhammers/recipes/stone_reinforced_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/stone_reinforced_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:stone_reinforced_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:stone_reinforced_hammer" + } } \ No newline at end of file diff --git a/common/src/generated/resources/data/justhammers/recipes/stone_reinforced_impact_hammer.json b/fabric/src/main/generated/data/justhammers/recipes/stone_reinforced_impact_hammer.json similarity index 77% rename from common/src/generated/resources/data/justhammers/recipes/stone_reinforced_impact_hammer.json rename to fabric/src/main/generated/data/justhammers/recipes/stone_reinforced_impact_hammer.json index a31c66a..9297ecc 100644 --- a/common/src/generated/resources/data/justhammers/recipes/stone_reinforced_impact_hammer.json +++ b/fabric/src/main/generated/data/justhammers/recipes/stone_reinforced_impact_hammer.json @@ -18,7 +18,7 @@ " b " ], "result": { - "item": "justhammers:stone_reinforced_impact_hammer" - }, - "show_notification": true + "count": 1, + "id": "justhammers:stone_reinforced_impact_hammer" + } } \ No newline at end of file diff --git a/fabric/src/main/java/pro/mikey/justhammers/fabric/DataGenerators.java b/fabric/src/main/java/pro/mikey/justhammers/fabric/DataGenerators.java new file mode 100644 index 0000000..56297dc --- /dev/null +++ b/fabric/src/main/java/pro/mikey/justhammers/fabric/DataGenerators.java @@ -0,0 +1,183 @@ +package pro.mikey.justhammers.fabric; + +import dev.architectury.registry.registries.RegistrySupplier; +import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricLanguageProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.models.BlockModelGenerators; +import net.minecraft.data.models.ItemModelGenerators; +import net.minecraft.data.models.model.ModelTemplates; +import net.minecraft.data.recipes.*; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.ItemLike; +import pro.mikey.justhammers.HammerItems; + +import java.util.concurrent.CompletableFuture; +import java.util.function.Supplier; + +public class DataGenerators implements DataGeneratorEntrypoint { + + @Override + public void onInitializeDataGenerator(FabricDataGenerator event) { + var pack = event.createPack(); + + pack.addProvider(RecipeGen::new); + pack.addProvider(LangGen::new); + pack.addProvider(ItemModelGen::new); + } + + public static class RecipeGen extends FabricRecipeProvider { + public RecipeGen(FabricDataOutput output, CompletableFuture registriesFuture) { + super(output, registriesFuture); + } + + @Override + public void buildRecipes(RecipeOutput consumer) { + standardHammer(HammerItems.STONE_HAMMER, Items.STONE).save(consumer); + standardHammer(HammerItems.IRON_HAMMER, Items.IRON_INGOT).save(consumer); + standardHammer(HammerItems.GOLD_HAMMER, Items.GOLD_INGOT).save(consumer); + standardHammer(HammerItems.DIAMOND_HAMMER, Items.DIAMOND).save(consumer); + standardHammer(HammerItems.NETHERITE_HAMMER, Items.NETHERITE_INGOT).save(consumer); + + coreHammer(HammerItems.STONE_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.STONE).save(consumer); + coreHammer(HammerItems.IRON_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.IRON_BLOCK).save(consumer); + coreHammer(HammerItems.GOLD_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.GOLD_BLOCK).save(consumer); + coreHammer(HammerItems.DIAMOND_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.DIAMOND_BLOCK).save(consumer); + coreHammer(HammerItems.NETHERITE_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.NETHERITE_BLOCK).save(consumer); + + coreHammer(HammerItems.STONE_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.STONE).save(consumer); + coreHammer(HammerItems.IRON_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.IRON_BLOCK).save(consumer); + coreHammer(HammerItems.GOLD_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.GOLD_BLOCK).save(consumer); + coreHammer(HammerItems.DIAMOND_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.DIAMOND_BLOCK).save(consumer); + coreHammer(HammerItems.NETHERITE_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.NETHERITE_BLOCK).save(consumer); + + coreHammer(HammerItems.STONE_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.STONE).save(consumer); + coreHammer(HammerItems.IRON_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.IRON_BLOCK).save(consumer); + coreHammer(HammerItems.GOLD_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.GOLD_BLOCK).save(consumer); + coreHammer(HammerItems.DIAMOND_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.DIAMOND_BLOCK).save(consumer); + coreHammer(HammerItems.NETHERITE_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.NETHERITE_BLOCK).save(consumer); + + coreHammer(HammerItems.STONE_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.STONE).save(consumer); + coreHammer(HammerItems.IRON_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.IRON_BLOCK).save(consumer); + coreHammer(HammerItems.GOLD_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.GOLD_BLOCK).save(consumer); + coreHammer(HammerItems.DIAMOND_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.DIAMOND_BLOCK).save(consumer); + coreHammer(HammerItems.NETHERITE_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.NETHERITE_BLOCK).save(consumer); + + // These kinda suck + core(HammerItems.IMPACT_CORE, Items.REDSTONE, HammerItems.NETHERITE_HAMMER.get(), Items.IRON_BLOCK, Items.GOLD_BLOCK).save(consumer); + core(HammerItems.REINFORCED_CORE, Items.REDSTONE_BLOCK, HammerItems.IMPACT_CORE.get(), Items.GOLD_BLOCK, Items.GOLD_BLOCK).save(consumer); + core(HammerItems.REINFORCED_IMPACT_CORE, Items.REDSTONE_BLOCK, HammerItems.REINFORCED_CORE.get(), Items.DIAMOND_BLOCK, Items.GOLD_BLOCK).save(consumer); + core(HammerItems.DESTRUCTOR_CORE, Items.REDSTONE_BLOCK, HammerItems.REINFORCED_IMPACT_CORE.get(), Items.DIAMOND_BLOCK, Items.DIAMOND_BLOCK).save(consumer); + } + + private RecipeBuilder standardHammer(Supplier hammer, ItemLike material) { + return ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, hammer.get()) + .define('a', material) + .define('b', Items.STICK) + .pattern("aba") + .pattern(" ba") + .pattern(" b ") + .unlockedBy("has_material", has(material)); + } + + private RecipeBuilder coreHammer(Supplier hammer, Supplier core, ItemLike material) { + return ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, hammer.get()) + .define('a', material) + .define('b', Items.STICK) + .define('c', core.get()) + .pattern("aca") + .pattern(" ba") + .pattern(" b ") + .unlockedBy("has_material", has(material)); + } + + private RecipeBuilder core(Supplier result, Item outside, Item inside, Item left, Item right) { + return ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, result.get()) + .define('a', outside) + .define('b', inside) + .define('c', left) + .define('d', right) + .pattern("aaa") + .pattern("cbd") + .pattern("aaa") + .unlockedBy("has_material", has(HammerItems.STONE_HAMMER.get())); + } + } + + public static class LangGen extends FabricLanguageProvider { + protected LangGen(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + super(dataOutput, "en_us", registryLookup); + } + + @Override + public void generateTranslations(HolderLookup.Provider registryLookup, TranslationBuilder translationBuilder) { + translationBuilder.add(HammerItems.STONE_HAMMER.get(), "Stone Hammer"); + translationBuilder.add(HammerItems.IRON_HAMMER.get(), "Iron Hammer"); + translationBuilder.add(HammerItems.GOLD_HAMMER.get(), "Gold Hammer"); + translationBuilder.add(HammerItems.DIAMOND_HAMMER.get(), "Diamond Hammer"); + translationBuilder.add(HammerItems.NETHERITE_HAMMER.get(), "Netherite Hammer"); + translationBuilder.add(HammerItems.STONE_IMPACT_HAMMER.get(), "Stone Impact Hammer"); + translationBuilder.add(HammerItems.IRON_IMPACT_HAMMER.get(), "Iron Impact Hammer"); + translationBuilder.add(HammerItems.GOLD_IMPACT_HAMMER.get(), "Gold Impact Hammer"); + translationBuilder.add(HammerItems.DIAMOND_IMPACT_HAMMER.get(), "Diamond Impact Hammer"); + translationBuilder.add(HammerItems.NETHERITE_IMPACT_HAMMER.get(), "Netherite Impact Hammer"); + translationBuilder.add(HammerItems.STONE_FIVE_HAMMER.get(), "Stone Reinforced Hammer"); + translationBuilder.add(HammerItems.IRON_FIVE_HAMMER.get(), "Iron Reinforced Hammer"); + translationBuilder.add(HammerItems.GOLD_FIVE_HAMMER.get(), "Gold Reinforced Hammer"); + translationBuilder.add(HammerItems.DIAMOND_FIVE_HAMMER.get(), "Diamond Reinforced Hammer"); + translationBuilder.add(HammerItems.NETHERITE_FIVE_HAMMER.get(), "Netherite Reinforced Hammer"); + translationBuilder.add(HammerItems.STONE_FIVE_IMPACT_HAMMER.get(), "Stone Reinforced Impact Hammer"); + translationBuilder.add(HammerItems.IRON_FIVE_IMPACT_HAMMER.get(), "Iron Reinforced Impact Hammer"); + translationBuilder.add(HammerItems.GOLD_FIVE_IMPACT_HAMMER.get(), "Gold Reinforced Impact Hammer"); + translationBuilder.add(HammerItems.DIAMOND_FIVE_IMPACT_HAMMER.get(), "Diamond Reinforced Impact Hammer"); + translationBuilder.add(HammerItems.NETHERITE_FIVE_IMPACT_HAMMER.get(), "Netherite Reinforced Impact Hammer"); + translationBuilder.add(HammerItems.STONE_FIVE_DESTROY_HAMMER.get(), "Stone Destructor Hammer"); + translationBuilder.add(HammerItems.IRON_FIVE_DESTROY_HAMMER.get(), "Iron Destructor Hammer"); + translationBuilder.add(HammerItems.GOLD_FIVE_DESTROY_HAMMER.get(), "Gold Destructor Hammer"); + translationBuilder.add(HammerItems.DIAMOND_FIVE_DESTROY_HAMMER.get(), "Diamond Destructor Hammer"); + translationBuilder.add(HammerItems.NETHERITE_FIVE_DESTROY_HAMMER.get(), "Netherite Destructor Hammer"); + + translationBuilder.add(HammerItems.IMPACT_CORE.get(), "Impact Core"); + translationBuilder.add(HammerItems.REINFORCED_CORE.get(), "Reinforced Core"); + translationBuilder.add(HammerItems.REINFORCED_IMPACT_CORE.get(), "Reinforced Impact Core"); + translationBuilder.add(HammerItems.DESTRUCTOR_CORE.get(), "Destruction Core"); + + translationBuilder.add("justhammers.tooltip.durability_warning", "Hammer durability nearing 0%!"); + translationBuilder.add("justhammers.tooltip.size", "Mines a %sx%sx%s area"); + + translationBuilder.add("itemGroup.justhammers.justhammers_tab", "Just Hammers"); + } + } + + public static class ItemModelGen extends FabricModelProvider { + public ItemModelGen(FabricDataOutput output) { + super(output); + } + + @Override + public void generateBlockStateModels(BlockModelGenerators blockStateModelGenerator) { + + } + + @Override + public void generateItemModels(ItemModelGenerators itemModelGenerator) { + HammerItems.HAMMERS.forEach(e -> handHeldItem(itemModelGenerator, e)); + + handHeldItem(itemModelGenerator, HammerItems.IMPACT_CORE); + handHeldItem(itemModelGenerator, HammerItems.REINFORCED_CORE); + handHeldItem(itemModelGenerator, HammerItems.REINFORCED_IMPACT_CORE); + handHeldItem(itemModelGenerator, HammerItems.DESTRUCTOR_CORE); + } + + private void handHeldItem(ItemModelGenerators itemModelGenerator, RegistrySupplier item) { + itemModelGenerator.generateFlatItem(item.get(), ModelTemplates.FLAT_ITEM); +// itemModelGenerator. +// singleTexture(path, mcLoc("item/handheld"), "layer0", modLoc("item/" + path)); + } + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 79f4d63..ffb6032 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -19,6 +19,9 @@ ], "client": [ "pro.mikey.justhammers.fabric.HammersFabricClient" + ], + "fabric-datagen": [ + "pro.mikey.justhammers.fabric.DataGenerators" ] }, "mixins": [ diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/data/DataGenerators.java b/forge/src/main/java/pro/mikey/justhammers/forge/data/DataGenerators.java deleted file mode 100644 index e34248d..0000000 --- a/forge/src/main/java/pro/mikey/justhammers/forge/data/DataGenerators.java +++ /dev/null @@ -1,181 +0,0 @@ -package pro.mikey.justhammers.forge.data; - -import dev.architectury.registry.registries.RegistrySupplier; -import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; -import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.*; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.ItemLike; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.common.data.LanguageProvider; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import pro.mikey.justhammers.HammerItems; -import pro.mikey.justhammers.Hammers; - -import java.util.concurrent.CompletableFuture; -import java.util.function.Supplier; - -@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) -public class DataGenerators { - - @SubscribeEvent - public static void onDataGen(GatherDataEvent event) { - DataGenerator generator = event.getGenerator(); - PackOutput output = generator.getPackOutput(); - ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - CompletableFuture lookupProvider = event.getLookupProvider(); - - generator.addProvider(event.includeClient(), new ItemModelGen(output, existingFileHelper)); - generator.addProvider(event.includeClient(), new LangGen(output)); - generator.addProvider(event.includeServer(), new RecipeGen(output, lookupProvider)); - } - - public static class RecipeGen extends RecipeProvider { - public RecipeGen(PackOutput output, CompletableFuture holder) { - super(output); - } - - @Override - protected void buildRecipes(RecipeOutput consumer) { - standardHammer(HammerItems.STONE_HAMMER, Items.STONE).save(consumer); - standardHammer(HammerItems.IRON_HAMMER, Items.IRON_INGOT).save(consumer); - standardHammer(HammerItems.GOLD_HAMMER, Items.GOLD_INGOT).save(consumer); - standardHammer(HammerItems.DIAMOND_HAMMER, Items.DIAMOND).save(consumer); - standardHammer(HammerItems.NETHERITE_HAMMER, Items.NETHERITE_INGOT).save(consumer); - - coreHammer(HammerItems.STONE_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.STONE).save(consumer); - coreHammer(HammerItems.IRON_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.IRON_BLOCK).save(consumer); - coreHammer(HammerItems.GOLD_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.GOLD_BLOCK).save(consumer); - coreHammer(HammerItems.DIAMOND_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.DIAMOND_BLOCK).save(consumer); - coreHammer(HammerItems.NETHERITE_IMPACT_HAMMER, HammerItems.IMPACT_CORE, Items.NETHERITE_BLOCK).save(consumer); - - coreHammer(HammerItems.STONE_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.STONE).save(consumer); - coreHammer(HammerItems.IRON_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.IRON_BLOCK).save(consumer); - coreHammer(HammerItems.GOLD_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.GOLD_BLOCK).save(consumer); - coreHammer(HammerItems.DIAMOND_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.DIAMOND_BLOCK).save(consumer); - coreHammer(HammerItems.NETHERITE_FIVE_HAMMER, HammerItems.REINFORCED_CORE, Items.NETHERITE_BLOCK).save(consumer); - - coreHammer(HammerItems.STONE_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.STONE).save(consumer); - coreHammer(HammerItems.IRON_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.IRON_BLOCK).save(consumer); - coreHammer(HammerItems.GOLD_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.GOLD_BLOCK).save(consumer); - coreHammer(HammerItems.DIAMOND_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.DIAMOND_BLOCK).save(consumer); - coreHammer(HammerItems.NETHERITE_FIVE_IMPACT_HAMMER, HammerItems.REINFORCED_IMPACT_CORE, Items.NETHERITE_BLOCK).save(consumer); - - coreHammer(HammerItems.STONE_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.STONE).save(consumer); - coreHammer(HammerItems.IRON_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.IRON_BLOCK).save(consumer); - coreHammer(HammerItems.GOLD_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.GOLD_BLOCK).save(consumer); - coreHammer(HammerItems.DIAMOND_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.DIAMOND_BLOCK).save(consumer); - coreHammer(HammerItems.NETHERITE_FIVE_DESTROY_HAMMER, HammerItems.DESTRUCTOR_CORE, Items.NETHERITE_BLOCK).save(consumer); - - // These kinda suck - core(HammerItems.IMPACT_CORE, Items.REDSTONE, HammerItems.NETHERITE_HAMMER.get(), Items.IRON_BLOCK, Items.GOLD_BLOCK).save(consumer); - core(HammerItems.REINFORCED_CORE, Items.REDSTONE_BLOCK, HammerItems.IMPACT_CORE.get(), Items.GOLD_BLOCK, Items.GOLD_BLOCK).save(consumer); - core(HammerItems.REINFORCED_IMPACT_CORE, Items.REDSTONE_BLOCK, HammerItems.REINFORCED_CORE.get(), Items.DIAMOND_BLOCK, Items.GOLD_BLOCK).save(consumer); - core(HammerItems.DESTRUCTOR_CORE, Items.REDSTONE_BLOCK, HammerItems.REINFORCED_IMPACT_CORE.get(), Items.DIAMOND_BLOCK, Items.DIAMOND_BLOCK).save(consumer); - } - - private RecipeBuilder standardHammer(Supplier hammer, ItemLike material) { - return ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, hammer.get()) - .define('a', material) - .define('b', Items.STICK) - .pattern("aba") - .pattern(" ba") - .pattern(" b ") - .unlockedBy("has_material", has(material)); - } - - private RecipeBuilder coreHammer(Supplier hammer, Supplier core, ItemLike material) { - return ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, hammer.get()) - .define('a', material) - .define('b', Items.STICK) - .define('c', core.get()) - .pattern("aca") - .pattern(" ba") - .pattern(" b ") - .unlockedBy("has_material", has(material)); - } - - private RecipeBuilder core(Supplier result, Item outside, Item inside, Item left, Item right) { - return ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, result.get()) - .define('a', outside) - .define('b', inside) - .define('c', left) - .define('d', right) - .pattern("aaa") - .pattern("cbd") - .pattern("aaa") - .unlockedBy("has_material", has(HammerItems.STONE_HAMMER.get())); - } - } - - public static class LangGen extends LanguageProvider { - public LangGen(PackOutput output) { - super(output, Hammers.MOD_ID, "en_us"); - } - - @Override - protected void addTranslations() { - addItem(HammerItems.STONE_HAMMER, "Stone Hammer"); - addItem(HammerItems.IRON_HAMMER, "Iron Hammer"); - addItem(HammerItems.GOLD_HAMMER, "Gold Hammer"); - addItem(HammerItems.DIAMOND_HAMMER, "Diamond Hammer"); - addItem(HammerItems.NETHERITE_HAMMER, "Netherite Hammer"); - addItem(HammerItems.STONE_IMPACT_HAMMER, "Stone Impact Hammer"); - addItem(HammerItems.IRON_IMPACT_HAMMER, "Iron Impact Hammer"); - addItem(HammerItems.GOLD_IMPACT_HAMMER, "Gold Impact Hammer"); - addItem(HammerItems.DIAMOND_IMPACT_HAMMER, "Diamond Impact Hammer"); - addItem(HammerItems.NETHERITE_IMPACT_HAMMER, "Netherite Impact Hammer"); - addItem(HammerItems.STONE_FIVE_HAMMER, "Stone Reinforced Hammer"); - addItem(HammerItems.IRON_FIVE_HAMMER, "Iron Reinforced Hammer"); - addItem(HammerItems.GOLD_FIVE_HAMMER, "Gold Reinforced Hammer"); - addItem(HammerItems.DIAMOND_FIVE_HAMMER, "Diamond Reinforced Hammer"); - addItem(HammerItems.NETHERITE_FIVE_HAMMER, "Netherite Reinforced Hammer"); - addItem(HammerItems.STONE_FIVE_IMPACT_HAMMER, "Stone Reinforced Impact Hammer"); - addItem(HammerItems.IRON_FIVE_IMPACT_HAMMER, "Iron Reinforced Impact Hammer"); - addItem(HammerItems.GOLD_FIVE_IMPACT_HAMMER, "Gold Reinforced Impact Hammer"); - addItem(HammerItems.DIAMOND_FIVE_IMPACT_HAMMER, "Diamond Reinforced Impact Hammer"); - addItem(HammerItems.NETHERITE_FIVE_IMPACT_HAMMER, "Netherite Reinforced Impact Hammer"); - addItem(HammerItems.STONE_FIVE_DESTROY_HAMMER, "Stone Destructor Hammer"); - addItem(HammerItems.IRON_FIVE_DESTROY_HAMMER, "Iron Destructor Hammer"); - addItem(HammerItems.GOLD_FIVE_DESTROY_HAMMER, "Gold Destructor Hammer"); - addItem(HammerItems.DIAMOND_FIVE_DESTROY_HAMMER, "Diamond Destructor Hammer"); - addItem(HammerItems.NETHERITE_FIVE_DESTROY_HAMMER, "Netherite Destructor Hammer"); - - addItem(HammerItems.IMPACT_CORE, "Impact Core"); - addItem(HammerItems.REINFORCED_CORE, "Reinforced Core"); - addItem(HammerItems.REINFORCED_IMPACT_CORE, "Reinforced Impact Core"); - addItem(HammerItems.DESTRUCTOR_CORE, "Destruction Core"); - - add("justhammers.tooltip.durability_warning", "Hammer durability nearing 0%!"); - add("justhammers.tooltip.size", "Mines a %sx%sx%s area"); - - add("itemGroup.justhammers.justhammers_tab", "Just Hammers"); - } - } - - public static class ItemModelGen extends ItemModelProvider { - public ItemModelGen(PackOutput output, ExistingFileHelper existingFileHelper) { - super(output, Hammers.MOD_ID, existingFileHelper); - } - - @Override - protected void registerModels() { - HammerItems.HAMMERS.forEach(this::handHeldItem); - - handHeldItem(HammerItems.IMPACT_CORE); - handHeldItem(HammerItems.REINFORCED_CORE); - handHeldItem(HammerItems.REINFORCED_IMPACT_CORE); - handHeldItem(HammerItems.DESTRUCTOR_CORE); - } - - private void handHeldItem(RegistrySupplier item) { - var path = item.getId().getPath(); - singleTexture(path, mcLoc("item/handheld"), "layer0", modLoc("item/" + path)); - } - } -} diff --git a/gradle.properties b/gradle.properties index 1e09923..d4e4dfa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,21 @@ org.gradle.jvmargs=-Xmx2048M -minecraft_version=1.20.4 -enabled_platforms=fabric,forge,neoforge +minecraft_version=1.20.6 +#enabled_platforms=fabric,forge,neoforge +enabled_platforms=fabric,neoforge archives_base_name=just-hammers -mod_version=84.0.0 +mod_version=20.6.0 maven_group=pro.mikey.mods -architectury_version=11.0.9 +architectury_version=12.1.3 -fabric_loader_version=0.15.3 -fabric_api_version=0.92.0+1.20.4 -forge_version=49.0.12 -neo_forge=20.4.62-beta +fabric_loader_version=0.15.11 +fabric_api_version=0.100.0+1.20.6 +forge_version=50.1.3 +neo_forge=20.6.113-beta -rei_version=14.0.688 +rei_version=15.0.728 # Publishing modrinth_id=edU0NbZZ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..0d18421 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 0fef7fa..9b18b0e 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -9,7 +9,7 @@ architectury { repositories { maven { - url "https://maven.saps.dev/mirror" + url "https://maven.neoforged.net/releases" } } @@ -19,6 +19,8 @@ loom { neoForge {} } +sourceSets.main.resources.srcDirs += project(":fabric").file("src/main/generated") + configurations { common shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. @@ -42,7 +44,7 @@ processResources { duplicatesStrategy(DuplicatesStrategy.EXCLUDE) inputs.property "version", project.version - filesMatching("META-INF/mods.toml") { + filesMatching("META-INF/neoforge.mods.toml") { expand "version": project.version } } diff --git a/neoforge/src/main/java/pro/mikey/justhammers/neoforge/HammersClientEvents.java b/neoforge/src/main/java/pro/mikey/justhammers/neoforge/HammersClientEvents.java index 2dec8ea..d45aabb 100644 --- a/neoforge/src/main/java/pro/mikey/justhammers/neoforge/HammersClientEvents.java +++ b/neoforge/src/main/java/pro/mikey/justhammers/neoforge/HammersClientEvents.java @@ -3,11 +3,11 @@ import net.minecraft.client.Minecraft; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.neoforge.client.event.RenderLevelStageEvent; import pro.mikey.justhammers.client.SelectionOutlineRender; -@Mod.EventBusSubscriber(value = Dist.CLIENT) +@EventBusSubscriber(value = Dist.CLIENT) public class HammersClientEvents { @SubscribeEvent public static void onWorldRenderLast(RenderLevelStageEvent event) { diff --git a/neoforge/src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java b/neoforge/src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java index 48320b9..eb141de 100644 --- a/neoforge/src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java +++ b/neoforge/src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java @@ -27,7 +27,7 @@ public class ServerPlayerGameModeMixinNeoForge { /** * This is used when we're in creative mode, and we're trying to mine a block */ - @Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayerGameMode;removeBlock(Lnet/minecraft/core/BlockPos;Z)Z", ordinal = 0, shift = At.Shift.BEFORE)) + @Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayerGameMode;removeBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)Z", ordinal = 0, shift = At.Shift.BEFORE)) public void justhammers$beforeRemoveBlock(BlockPos blockPos, CallbackInfoReturnable cir) { this.hammerMineBlock(blockPos); } diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml similarity index 84% rename from neoforge/src/main/resources/META-INF/mods.toml rename to neoforge/src/main/resources/META-INF/neoforge.mods.toml index 9861ec9..f9ae837 100644 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,5 +1,5 @@ modLoader = "javafml" -loaderVersion = "[1,)" +loaderVersion = "[2,)" #issueTrackerURL = "" license = "GPL3" @@ -10,21 +10,21 @@ version = "${version}" displayName = "Just Hammers" authors = "ErrorMikey" description = ''' -Add hammers to the game that are able to mine in a 3x3, 3x3x3, 5x5x3 and finally a 5x5x5! They're pretty awesome. +Add hammers to the game that are able to mine in a 3x3, 3x3x3, 5x5x3 and finally a 5x5x5! They\'re pretty awesome. ''' #logoFile = "" [[dependencies.justhammers]] modId = "neoforge" required = true -versionRange = "[20.4,)" +versionRange = "[20.6,)" ordering = "NONE" side = "BOTH" [[dependencies.justhammers]] modId = "minecraft" required = true -versionRange = "[1.20.4,)" +versionRange = "[1.20.6,)" ordering = "NONE" side = "BOTH" diff --git a/settings.gradle b/settings.gradle index 913fac7..83e4530 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ pluginManagement { repositories { maven { url "https://maven.neoforged.net/releases" } - maven { url "https://maven.creeperhost.net/" } maven { url "https://maven.fabricmc.net/" } maven { url "https://maven.architectury.dev/" } maven { url "https://maven.minecraftforge.net/" } @@ -9,6 +8,7 @@ pluginManagement { } } -include "common", "forge", "neoforge", "fabric" +//include "common", "forge", "neoforge", "fabric" +include "common", "neoforge", "fabric" rootProject.name = "just-hammers"