diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5c3222f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,59 @@ +name: Build and Artifact + +on: + push: + branches: [ master, main ] + pull_request: + branches: [ master, main ] + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-24.04 + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: 'temurin' + java-version: '21' + cache: 'gradle' + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + .gradle + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew clean build + + - name: Upload Fabric JAR + uses: actions/upload-artifact@v3 + with: + name: nuggetmod-fabric + path: fabric/build/libs/*.jar + + - name: Upload NeoForge JAR + uses: actions/upload-artifact@v3 + with: + name: nuggetmod-neoforge + path: neoforge/build/libs/*.jar + + - name: Upload Common JAR + uses: actions/upload-artifact@v3 + with: + name: nuggetmod-common + path: common/build/libs/*.jar + diff --git a/common/build.gradle b/common/build.gradle index 816616f..4134746 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -2,6 +2,15 @@ architectury { common rootProject.enabled_platforms.split(',') } + +sourceSets { + main { + resources { + srcDir 'src/main/generated' + } + } +} + dependencies { // We depend on Fabric Loader here to use the Fabric @Environment annotations, // which get remapped to the correct annotations on each platform. diff --git a/fabric/src/main/generated/assets/nuggetmod/blockstates/nugget_block.json b/common/src/main/generated/assets/nuggetmod/blockstates/nugget_block.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/blockstates/nugget_block.json rename to common/src/main/generated/assets/nuggetmod/blockstates/nugget_block.json diff --git a/fabric/src/main/generated/assets/nuggetmod/blockstates/nugget_deepslate_ore.json b/common/src/main/generated/assets/nuggetmod/blockstates/nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/blockstates/nugget_deepslate_ore.json rename to common/src/main/generated/assets/nuggetmod/blockstates/nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/assets/nuggetmod/blockstates/nugget_ore.json b/common/src/main/generated/assets/nuggetmod/blockstates/nugget_ore.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/blockstates/nugget_ore.json rename to common/src/main/generated/assets/nuggetmod/blockstates/nugget_ore.json diff --git a/fabric/src/main/generated/assets/nuggetmod/blockstates/raw_nugget_block.json b/common/src/main/generated/assets/nuggetmod/blockstates/raw_nugget_block.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/blockstates/raw_nugget_block.json rename to common/src/main/generated/assets/nuggetmod/blockstates/raw_nugget_block.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget.json b/common/src/main/generated/assets/nuggetmod/items/nugget.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget.json rename to common/src/main/generated/assets/nuggetmod/items/nugget.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json b/common/src/main/generated/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_armor_trim_smithing_template.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_axe.json b/common/src/main/generated/assets/nuggetmod/items/nugget_axe.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_axe.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_axe.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_block.json b/common/src/main/generated/assets/nuggetmod/items/nugget_block.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_block.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_block.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_boots.json b/common/src/main/generated/assets/nuggetmod/items/nugget_boots.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_boots.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_boots.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_chestplate.json b/common/src/main/generated/assets/nuggetmod/items/nugget_chestplate.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_chestplate.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_chestplate.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_deepslate_ore.json b/common/src/main/generated/assets/nuggetmod/items/nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_deepslate_ore.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_helmet.json b/common/src/main/generated/assets/nuggetmod/items/nugget_helmet.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_helmet.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_helmet.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_hoe.json b/common/src/main/generated/assets/nuggetmod/items/nugget_hoe.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_hoe.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_hoe.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_horse_armor.json b/common/src/main/generated/assets/nuggetmod/items/nugget_horse_armor.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_horse_armor.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_horse_armor.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_leggings.json b/common/src/main/generated/assets/nuggetmod/items/nugget_leggings.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_leggings.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_leggings.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_music_disc.json b/common/src/main/generated/assets/nuggetmod/items/nugget_music_disc.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_music_disc.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_music_disc.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_ore.json b/common/src/main/generated/assets/nuggetmod/items/nugget_ore.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_ore.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_ore.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_pickaxe.json b/common/src/main/generated/assets/nuggetmod/items/nugget_pickaxe.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_pickaxe.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_pickaxe.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_shovel.json b/common/src/main/generated/assets/nuggetmod/items/nugget_shovel.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_shovel.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_shovel.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_spear.json b/common/src/main/generated/assets/nuggetmod/items/nugget_spear.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_spear.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_spear.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/nugget_sword.json b/common/src/main/generated/assets/nuggetmod/items/nugget_sword.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/nugget_sword.json rename to common/src/main/generated/assets/nuggetmod/items/nugget_sword.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/raw_nugget.json b/common/src/main/generated/assets/nuggetmod/items/raw_nugget.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/raw_nugget.json rename to common/src/main/generated/assets/nuggetmod/items/raw_nugget.json diff --git a/fabric/src/main/generated/assets/nuggetmod/items/raw_nugget_block.json b/common/src/main/generated/assets/nuggetmod/items/raw_nugget_block.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/items/raw_nugget_block.json rename to common/src/main/generated/assets/nuggetmod/items/raw_nugget_block.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/block/nugget_block.json b/common/src/main/generated/assets/nuggetmod/models/block/nugget_block.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/block/nugget_block.json rename to common/src/main/generated/assets/nuggetmod/models/block/nugget_block.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/block/nugget_deepslate_ore.json b/common/src/main/generated/assets/nuggetmod/models/block/nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/block/nugget_deepslate_ore.json rename to common/src/main/generated/assets/nuggetmod/models/block/nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/block/nugget_ore.json b/common/src/main/generated/assets/nuggetmod/models/block/nugget_ore.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/block/nugget_ore.json rename to common/src/main/generated/assets/nuggetmod/models/block/nugget_ore.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/block/raw_nugget_block.json b/common/src/main/generated/assets/nuggetmod/models/block/raw_nugget_block.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/block/raw_nugget_block.json rename to common/src/main/generated/assets/nuggetmod/models/block/raw_nugget_block.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_armor_trim_smithing_template.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_axe.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_axe.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_axe.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_axe.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_amethyst_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_copper_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_copper_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_copper_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_copper_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_diamond_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_emerald_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_gold_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_gold_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_gold_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_gold_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_iron_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_iron_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_iron_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_iron_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_lapis_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_netherite_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_quartz_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_redstone_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_resin_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_resin_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_boots_resin_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_boots_resin_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_amethyst_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_copper_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_diamond_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_emerald_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_gold_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_iron_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_lapis_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_netherite_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_quartz_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_redstone_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_chestplate_resin_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_amethyst_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_copper_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_diamond_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_emerald_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_gold_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_iron_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_lapis_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_netherite_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_quartz_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_redstone_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_helmet_resin_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_hoe.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_hoe.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_hoe.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_hoe.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_horse_armor.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_horse_armor.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_horse_armor.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_horse_armor.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_amethyst_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_copper_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_diamond_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_emerald_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_gold_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_iron_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_lapis_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_netherite_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_quartz_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_redstone_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_leggings_resin_trim.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_music_disc.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_music_disc.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_music_disc.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_music_disc.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_pickaxe.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_pickaxe.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_pickaxe.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_pickaxe.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_shovel.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_shovel.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_shovel.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_shovel.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_spear.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_spear.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_spear.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_spear.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/nugget_sword.json b/common/src/main/generated/assets/nuggetmod/models/item/nugget_sword.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/nugget_sword.json rename to common/src/main/generated/assets/nuggetmod/models/item/nugget_sword.json diff --git a/fabric/src/main/generated/assets/nuggetmod/models/item/raw_nugget.json b/common/src/main/generated/assets/nuggetmod/models/item/raw_nugget.json similarity index 100% rename from fabric/src/main/generated/assets/nuggetmod/models/item/raw_nugget.json rename to common/src/main/generated/assets/nuggetmod/models/item/raw_nugget.json diff --git a/fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json rename to common/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/fabric/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json b/common/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json rename to common/src/main/generated/data/minecraft/tags/block/needs_diamond_tool.json diff --git a/fabric/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json b/common/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json rename to common/src/main/generated/data/minecraft/tags/block/needs_stone_tool.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/axes.json b/common/src/main/generated/data/minecraft/tags/item/axes.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/axes.json rename to common/src/main/generated/data/minecraft/tags/item/axes.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/hoes.json b/common/src/main/generated/data/minecraft/tags/item/hoes.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/hoes.json rename to common/src/main/generated/data/minecraft/tags/item/hoes.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/pickaxes.json b/common/src/main/generated/data/minecraft/tags/item/pickaxes.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/pickaxes.json rename to common/src/main/generated/data/minecraft/tags/item/pickaxes.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/shovels.json b/common/src/main/generated/data/minecraft/tags/item/shovels.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/shovels.json rename to common/src/main/generated/data/minecraft/tags/item/shovels.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/spears.json b/common/src/main/generated/data/minecraft/tags/item/spears.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/spears.json rename to common/src/main/generated/data/minecraft/tags/item/spears.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/swords.json b/common/src/main/generated/data/minecraft/tags/item/swords.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/swords.json rename to common/src/main/generated/data/minecraft/tags/item/swords.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/trim_materials.json b/common/src/main/generated/data/minecraft/tags/item/trim_materials.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/trim_materials.json rename to common/src/main/generated/data/minecraft/tags/item/trim_materials.json diff --git a/fabric/src/main/generated/data/minecraft/tags/item/trimmable_armor.json b/common/src/main/generated/data/minecraft/tags/item/trimmable_armor.json similarity index 100% rename from fabric/src/main/generated/data/minecraft/tags/item/trimmable_armor.json rename to common/src/main/generated/data/minecraft/tags/item/trimmable_armor.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/building_blocks/nugget.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/building_blocks/nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/building_blocks/nugget.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/building_blocks/nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_boots.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_boots.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_boots.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_boots.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_chestplate.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_helmet.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_leggings.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_spear.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_spear.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_spear.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_spear.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_sword.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_sword.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_sword.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/combat/nugget_sword.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/decorations/nugget_block.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/decorations/nugget_block.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/decorations/nugget_block.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/decorations/nugget_block.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_nugget_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_blasting_raw_nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_nugget_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_from_smelting_raw_nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/nugget_smithing_template.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/misc/raw_nugget_block.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_axe.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_axe.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_axe.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_axe.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_hoe.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_pickaxe.json diff --git a/fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json b/common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json rename to common/src/main/generated/data/nuggetmod/advancement/recipes/tools/nugget_shovel.json diff --git a/fabric/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_block.json b/common/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_block.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_block.json rename to common/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_block.json diff --git a/fabric/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json b/common/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json rename to common/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_ore.json b/common/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_ore.json rename to common/src/main/generated/data/nuggetmod/loot_table/blocks/nugget_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/loot_table/blocks/raw_nugget_block.json b/common/src/main/generated/data/nuggetmod/loot_table/blocks/raw_nugget_block.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/loot_table/blocks/raw_nugget_block.json rename to common/src/main/generated/data/nuggetmod/loot_table/blocks/raw_nugget_block.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget.json b/common/src/main/generated/data/nuggetmod/recipe/nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_axe.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_axe.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_axe.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_axe.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_block.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_block.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_block.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_block.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_boots.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_boots.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_boots.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_boots.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_chestplate.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_chestplate.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_chestplate.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_chestplate.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_nugget_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_from_blasting_raw_nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_deepslate_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_nugget_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_from_smelting_raw_nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_helmet.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_helmet.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_helmet.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_helmet.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_hoe.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_hoe.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_hoe.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_hoe.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_leggings.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_leggings.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_leggings.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_leggings.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_pickaxe.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_pickaxe.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_pickaxe.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_pickaxe.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_shovel.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_shovel.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_shovel.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_shovel.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_smithing_template.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_smithing_template.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_smithing_template.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_smithing_template.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_spear.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_spear.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_spear.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_spear.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/nugget_sword.json b/common/src/main/generated/data/nuggetmod/recipe/nugget_sword.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/nugget_sword.json rename to common/src/main/generated/data/nuggetmod/recipe/nugget_sword.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/raw_nugget.json b/common/src/main/generated/data/nuggetmod/recipe/raw_nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/raw_nugget.json rename to common/src/main/generated/data/nuggetmod/recipe/raw_nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/recipe/raw_nugget_block.json b/common/src/main/generated/data/nuggetmod/recipe/raw_nugget_block.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/recipe/raw_nugget_block.json rename to common/src/main/generated/data/nuggetmod/recipe/raw_nugget_block.json diff --git a/fabric/src/main/generated/data/nuggetmod/tags/block/needs_nugget_tool.json b/common/src/main/generated/data/nuggetmod/tags/block/needs_nugget_tool.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/tags/block/needs_nugget_tool.json rename to common/src/main/generated/data/nuggetmod/tags/block/needs_nugget_tool.json diff --git a/fabric/src/main/generated/data/nuggetmod/trim_material/nugget.json b/common/src/main/generated/data/nuggetmod/trim_material/nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/trim_material/nugget.json rename to common/src/main/generated/data/nuggetmod/trim_material/nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/trim_pattern/nugget.json b/common/src/main/generated/data/nuggetmod/trim_pattern/nugget.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/trim_pattern/nugget.json rename to common/src/main/generated/data/nuggetmod/trim_pattern/nugget.json diff --git a/fabric/src/main/generated/data/nuggetmod/worldgen/configured_feature/nugget_ore.json b/common/src/main/generated/data/nuggetmod/worldgen/configured_feature/nugget_ore.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/worldgen/configured_feature/nugget_ore.json rename to common/src/main/generated/data/nuggetmod/worldgen/configured_feature/nugget_ore.json diff --git a/fabric/src/main/generated/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json b/common/src/main/generated/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json similarity index 100% rename from fabric/src/main/generated/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json rename to common/src/main/generated/data/nuggetmod/worldgen/placed_feature/nugget_ore_placed.json diff --git a/common/src/main/resources/assets/minecraft/atlases/armor_trims.json b/common/src/main/resources/assets/minecraft/atlases/armor_trims.json index cf03301..863859f 100644 --- a/common/src/main/resources/assets/minecraft/atlases/armor_trims.json +++ b/common/src/main/resources/assets/minecraft/atlases/armor_trims.json @@ -1,63 +1,69 @@ { - "replace": false, - "sources": [ - { - "type": "paletted_permutations", - "textures": [ - "trims/models/armor/coast", - "trims/models/armor/coast_leggings", - "trims/models/armor/sentry", - "trims/models/armor/sentry_leggings", - "trims/models/armor/dune", - "trims/models/armor/dune_leggings", - "trims/models/armor/wild", - "trims/models/armor/wild_leggings", - "trims/models/armor/ward", - "trims/models/armor/ward_leggings", - "trims/models/armor/eye", - "trims/models/armor/eye_leggings", - "trims/models/armor/vex", - "trims/models/armor/vex_leggings", - "trims/models/armor/tide", - "trims/models/armor/tide_leggings", - "trims/models/armor/snout", - "trims/models/armor/snout_leggings", - "trims/models/armor/rib", - "trims/models/armor/rib_leggings", - "trims/models/armor/spire", - "trims/models/armor/spire_leggings", - "trims/models/armor/wayfinder", - "trims/models/armor/wayfinder_leggings", - "trims/models/armor/shaper", - "trims/models/armor/shaper_leggings", - "trims/models/armor/silence", - "trims/models/armor/silence_leggings", - "trims/models/armor/raiser", - "trims/models/armor/raiser_leggings", - "trims/models/armor/host", - "trims/models/armor/host_leggings", - "nuggetmod:trims/models/armor/nugget", - "nuggetmod:trims/models/armor/nugget_leggings" - - ], - "palette_key": "trims/color_palettes/trim_palette", - "permutations": { - "quartz": "trims/color_palettes/quartz", - "iron": "trims/color_palettes/iron", - "gold": "trims/color_palettes/gold", - "diamond": "trims/color_palettes/diamond", - "netherite": "trims/color_palettes/netherite", - "redstone": "trims/color_palettes/redstone", - "copper": "trims/color_palettes/copper", - "emerald": "trims/color_palettes/emerald", - "lapis": "trims/color_palettes/lapis", - "amethyst": "trims/color_palettes/amethyst", - "iron_darker": "trims/color_palettes/iron_darker", - "gold_darker": "trims/color_palettes/gold_darker", - "diamond_darker": "trims/color_palettes/diamond_darker", - "netherite_darker": "trims/color_palettes/netherite_darker", - "nugget": "nuggetmod:trims/color_palettes/nugget" - } + "replace": false, + "sources": [ + { + "type": "paletted_permutations", + "textures": [ + "trims/entity/humanoid/sentry", + "trims/entity/humanoid_leggings/sentry", + "trims/entity/humanoid/dune", + "trims/entity/humanoid_leggings/dune", + "trims/entity/humanoid/coast", + "trims/entity/humanoid_leggings/coast", + "trims/entity/humanoid/wild", + "trims/entity/humanoid_leggings/wild", + "trims/entity/humanoid/ward", + "trims/entity/humanoid_leggings/ward", + "trims/entity/humanoid/eye", + "trims/entity/humanoid_leggings/eye", + "trims/entity/humanoid/vex", + "trims/entity/humanoid_leggings/vex", + "trims/entity/humanoid/tide", + "trims/entity/humanoid_leggings/tide", + "trims/entity/humanoid/snout", + "trims/entity/humanoid_leggings/snout", + "trims/entity/humanoid/rib", + "trims/entity/humanoid_leggings/rib", + "trims/entity/humanoid/spire", + "trims/entity/humanoid_leggings/spire", + "trims/entity/humanoid/wayfinder", + "trims/entity/humanoid_leggings/wayfinder", + "trims/entity/humanoid/shaper", + "trims/entity/humanoid_leggings/shaper", + "trims/entity/humanoid/silence", + "trims/entity/humanoid_leggings/silence", + "trims/entity/humanoid/raiser", + "trims/entity/humanoid_leggings/raiser", + "trims/entity/humanoid/host", + "trims/entity/humanoid_leggings/host", + "trims/entity/humanoid/flow", + "trims/entity/humanoid_leggings/flow", + "trims/entity/humanoid/bolt", + "trims/entity/humanoid_leggings/bolt", + "nuggetmod:trims/entity/humanoid/nugget", + "nuggetmod:trims/entity/humanoid_leggings/nugget" + ], + "palette_key": "trims/color_palettes/trim_palette", + "permutations": { + "amethyst": "trims/color_palettes/amethyst", + "copper": "trims/color_palettes/copper", + "copper_darker": "trims/color_palettes/copper_darker", + "diamond": "trims/color_palettes/diamond", + "diamond_darker": "trims/color_palettes/diamond_darker", + "emerald": "trims/color_palettes/emerald", + "gold": "trims/color_palettes/gold", + "gold_darker": "trims/color_palettes/gold_darker", + "iron": "trims/color_palettes/iron", + "iron_darker": "trims/color_palettes/iron_darker", + "lapis": "trims/color_palettes/lapis", + "netherite": "trims/color_palettes/netherite", + "netherite_darker": "trims/color_palettes/netherite_darker", + "quartz": "trims/color_palettes/quartz", + "redstone": "trims/color_palettes/redstone", + "resin": "trims/color_palettes/resin", + "nugget": "nuggetmod:trims/color_palettes/nugget" } - ] - } \ No newline at end of file + } + ] +} + diff --git a/common/src/main/resources/assets/nuggetmod/lang/en_us.json b/common/src/main/resources/assets/nuggetmod/lang/en_us.json index 7fc444d..cc2495e 100644 --- a/common/src/main/resources/assets/nuggetmod/lang/en_us.json +++ b/common/src/main/resources/assets/nuggetmod/lang/en_us.json @@ -38,6 +38,8 @@ "item.nuggetmod.nugget.tooltip": "THE NUGGET", + "entity.minecraft.villager.nuggeter": "Nuggeter", + "trim_material.nuggetmod.nugget": "Nugget Material", "trim_pattern.nuggetmod.nugget_trim_material": "Nugget Trim", "trim_pattern.nuggetmod.nugget_armor_trim_smithing_template": "ยง6Nugget Armor Trim", diff --git a/common/src/main/resources/assets/nuggetmod/textures/trims/models/armor/nugget.png b/common/src/main/resources/assets/nuggetmod/textures/trims/entity/humanoid/nugget.png similarity index 100% rename from common/src/main/resources/assets/nuggetmod/textures/trims/models/armor/nugget.png rename to common/src/main/resources/assets/nuggetmod/textures/trims/entity/humanoid/nugget.png diff --git a/common/src/main/resources/assets/nuggetmod/textures/trims/models/armor/nugget_leggings.png b/common/src/main/resources/assets/nuggetmod/textures/trims/entity/humanoid_leggings/nugget.png similarity index 100% rename from common/src/main/resources/assets/nuggetmod/textures/trims/models/armor/nugget_leggings.png rename to common/src/main/resources/assets/nuggetmod/textures/trims/entity/humanoid_leggings/nugget.png diff --git a/common/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json b/common/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json new file mode 100644 index 0000000..7885626 --- /dev/null +++ b/common/src/main/resources/data/minecraft/tags/point_of_interest_type/acquirable_job_site.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "nuggetmod:nuggeter_poi", + "required": false + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/icon.png b/common/src/main/resources/icon.png new file mode 100644 index 0000000..fe2ea3c Binary files /dev/null and b/common/src/main/resources/icon.png differ diff --git a/fabric/build.gradle b/fabric/build.gradle index cc0db31..10e1ae5 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -57,5 +57,20 @@ remapJar { fabricApi { configureDataGeneration() { client = true + modId = project.archives_name + createSourceSet = false + } +} + +loom { + runs { + datagen { + client() + name "Data Generation" + vmArg "-Dfabric-api.datagen.output-dir=${project(':common').file('src/main/generated')}" + vmArg "-Dfabric-api.datagen.modid=${project.archives_name}" + + runDir "build/datagen" + } } } \ No newline at end of file diff --git a/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/NuggetMod.java b/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/NuggetMod.java index d07e593..d3de1ce 100644 --- a/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/NuggetMod.java +++ b/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/NuggetMod.java @@ -35,7 +35,10 @@ public class NuggetMod implements ModInitializer { // Fabric-specific registrations ModItemGroups.registerItemGroups(); ModWorldGeneration.generateModWorldGen(); + + // IMPORTANT: Register villagers before trades ModVillagers.registerVillagers(); + ModParticles.registerParticles(); // Register tooltip for nugget item using Fabric API @@ -56,41 +59,90 @@ public class NuggetMod implements ModInitializer { entries.add(ModBlocks.RAW_NUGGET_BLOCK.get()); }); - // Villager trades + // Register trades AFTER villager registration + registerVillagerTrades(); + } + + private void registerVillagerTrades() { + LOGGER.info("Registering villager trades..."); + + // Villager trades - Vanilla Farmer TradeOfferHelper.registerVillagerOffers(VillagerProfession.FARMER, 1, factories -> { factories.add((world,entity, random) -> new TradeOffer( new TradedItem(Items.EMERALD, 3), new ItemStack(ModItems.NUGGET.get(), 8), 7, 2, 0.04f)); }); + // Custom Nuggeter Villager Trades - Level 1 (Novice) TradeOfferHelper.registerVillagerOffers(ModVillagers.NUGGETER_KEY, 1, factories -> { factories.add((world,entity, random) -> new TradeOffer( new TradedItem(Items.EMERALD, 5), new ItemStack(ModItems.NUGGET.get(), 20), 4, 7, 0.04f)); factories.add((world,entity, random) -> new TradeOffer( - new TradedItem(ModItems.NUGGET.get(), 16), - new ItemStack(ModItems.NUGGET_HORSE_ARMOR.get(), 1), 4, 7, 0.04f)); + new TradedItem(Items.DIAMOND, 2), + new ItemStack(ModItems.RAW_NUGGET.get(), 12), 6, 5, 0.05f)); }); + // Custom Nuggeter Villager Trades - Level 2 (Apprentice) TradeOfferHelper.registerVillagerOffers(ModVillagers.NUGGETER_KEY, 2, factories -> { factories.add((world,entity, random) -> new TradeOffer( - new TradedItem(ModItems.NUGGET.get(), 10), - new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 4, 7, 0.04f)); + new TradedItem(Items.GOLD_INGOT, 8), + new ItemStack(ModItems.NUGGET_SWORD.get(), 1), 3, 10, 0.05f)); factories.add((world,entity, random) -> new TradeOffer( - new TradedItem(ModItems.NUGGET.get(), 10), - new ItemStack(ModItems.NUGGET_MUSIC_DISC.get(), 1), 3, 12, 0.09f)); + new TradedItem(Items.EMERALD, 10), + new ItemStack(ModItems.NUGGET_PICKAXE.get(), 1), 3, 10, 0.05f)); }); - TradeOfferHelper.registerWanderingTraderOffers(factories -> { - factories.addAll(Identifier.of(NuggetMod.MOD_ID, "emerald_for_nuggetsmithing"), (world, entity, random) -> new TradeOffer( - new TradedItem(Items.EMERALD, 25), - new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 4, 7, 0.04f)); + // Custom Nuggeter Villager Trades - Level 3 (Journeyman) + TradeOfferHelper.registerVillagerOffers(ModVillagers.NUGGETER_KEY, 3, factories -> { + factories.add((world,entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 15), + new ItemStack(ModItems.NUGGET_HELMET.get(), 1), 2, 15, 0.05f)); - factories.addAll(Identifier.of(NuggetMod.MOD_ID, "nuggets_to_musicdisc"), (world, entity, random) -> new TradeOffer( - new TradedItem(ModItems.NUGGET.get(), 15), - new ItemStack(ModItems.NUGGET_MUSIC_DISC.get(), 1), 3, 12, 0.09f)); + factories.add((world,entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 20), + new ItemStack(ModItems.NUGGET_CHESTPLATE.get(), 1), 2, 15, 0.05f)); + }); + + // Custom Nuggeter Villager Trades - Level 4 (Expert) + TradeOfferHelper.registerVillagerOffers(ModVillagers.NUGGETER_KEY, 4, factories -> { + factories.add((world,entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 5), + new ItemStack(ModItems.NUGGET_LEGGINGS.get(), 1), 2, 20, 0.05f)); + + factories.add((world,entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 12), + new ItemStack(ModItems.NUGGET_BOOTS.get(), 1), 2, 20, 0.05f)); + }); + + // Custom Nuggeter Villager Trades - Level 5 (Master) + TradeOfferHelper.registerVillagerOffers(ModVillagers.NUGGETER_KEY, 5, factories -> { + factories.add((world,entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 30), + new ItemStack(ModItems.NUGGET_HORSE_ARMOR.get(), 1), 1, 30, 0.1f)); + + factories.add((world,entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 10), + new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 1, 30, 0.1f)); + }); + + // Wandering Trader Trades + TradeOfferHelper.registerWanderingTraderOffers(factories -> { + // Generic trades + factories.addAll(Identifier.of(NuggetMod.MOD_ID, "emerald_for_nugget"), (world, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 12), + new ItemStack(ModItems.NUGGET.get(), 3), 2, 8, 0.2f)); + + // Rare trades + factories.addAll(Identifier.of(NuggetMod.MOD_ID, "diamond_for_musicdisc"), (world, entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 8), + new ItemStack(ModItems.NUGGET_MUSIC_DISC.get(), 1), 1, 12, 0.2f)); + + factories.addAll(Identifier.of(NuggetMod.MOD_ID, "emerald_for_smithingtemplate"), (world, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 25), + new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 1, 12, 0.2f)); }); } } diff --git a/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/villager/ModVillagers.java b/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/villager/ModVillagers.java index 394adca..8986c92 100644 --- a/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/villager/ModVillagers.java +++ b/fabric/src/main/java/dev/sillyangel/nuggetmod/fabric/villager/ModVillagers.java @@ -1,6 +1,7 @@ package dev.sillyangel.nuggetmod.fabric.villager; import com.google.common.collect.ImmutableSet; +import dev.sillyangel.nuggetmod.block.ModBlocks; import net.fabricmc.fabric.api.object.builder.v1.world.poi.PointOfInterestHelper; import dev.sillyangel.nuggetmod.fabric.NuggetMod; import net.minecraft.block.Block; @@ -15,7 +16,8 @@ import net.minecraft.village.VillagerProfession; import net.minecraft.world.poi.PointOfInterestType; public class ModVillagers { - public static final RegistryKey NUGGETER_POI_KEY = registerPoiKey("kaupen_poi"); + public static final RegistryKey NUGGETER_POI_KEY = registerPoiKey("nuggeter_poi"); + public static final PointOfInterestType NUGGETER_POI = registerPOI("nuggeter_poi", ModBlocks.NUGGET_BLOCK.get()); public static final RegistryKey NUGGETER_KEY = RegistryKey.of(RegistryKeys.VILLAGER_PROFESSION, Identifier.of(NuggetMod.MOD_ID, "nuggeter")); diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index da97460..b54803d 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -3,7 +3,7 @@ "id": "nuggetmod", "version": "${version}", "name": "Nugget Mod", - "description": "A Fabric mod that brings the meme of Gegagedigedagedago Nugget into the Minecraft, Whether you are building, mining, or battling, this mod introduces nugget around the minecraft theme. Perfect for players looking play with their world with humor and creativity.", + "description": "A Minecraft mod that brings the meme of Gegagedigedagedago Nugget into the Minecraft.", "authors": [ "sillyangel" ], diff --git a/gradle.properties b/gradle.properties index 8ecd77c..364d522 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 1.3.0 +mod_version = 1.3.1 maven_group = dev.sillyangel.nuggetmod archives_name = nuggetmod enabled_platforms = fabric,neoforge diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/NuggetMod.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/NuggetMod.java index b8df625..1a42c44 100644 --- a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/NuggetMod.java +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/NuggetMod.java @@ -3,17 +3,18 @@ package dev.sillyangel.nuggetmod.neoforge; import dev.sillyangel.nuggetmod.neoforge.item.ModItemGroups; import dev.sillyangel.nuggetmod.neoforge.particle.ModParticles; import dev.sillyangel.nuggetmod.neoforge.villager.ModVillagers; +import net.neoforged.bus.api.IEventBus; import net.neoforged.fml.common.Mod; @Mod(dev.sillyangel.nuggetmod.NuggetMod.MOD_ID) public final class NuggetMod { - public NuggetMod() { + public NuggetMod(IEventBus modEventBus) { // Run our common setup. dev.sillyangel.nuggetmod.NuggetMod.init(); // Register NeoForge-specific features - ModParticles.registerParticles(); - ModVillagers.registerVillagers(); - ModItemGroups.registerItemGroups(); + ModParticles.registerParticles(modEventBus); + ModVillagers.registerVillagers(modEventBus); + ModItemGroups.registerItemGroups(modEventBus); } } diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/client/NuggetModClient.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/client/NuggetModClient.java index a8dfc3e..411811a 100644 --- a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/client/NuggetModClient.java +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/client/NuggetModClient.java @@ -13,7 +13,7 @@ public class NuggetModClient { @SubscribeEvent public static void registerParticleFactories(RegisterParticleProvidersEvent event) { - event.registerSpriteSet(ModParticles.NUGGET_PARTICLE, NuggetParticle.Factory::new); + event.registerSpriteSet(ModParticles.NUGGET_PARTICLE.get(), NuggetParticle.Factory::new); } } diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/event/ModEvents.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/event/ModEvents.java new file mode 100644 index 0000000..004ebbd --- /dev/null +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/event/ModEvents.java @@ -0,0 +1,105 @@ +package dev.sillyangel.nuggetmod.neoforge.event; + +import dev.sillyangel.nuggetmod.NuggetMod; +import dev.sillyangel.nuggetmod.item.ModItems; +import dev.sillyangel.nuggetmod.neoforge.villager.ModVillagers; +import it.unimi.dsi.fastutil.ints.Int2ObjectMap; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; +import net.minecraft.village.TradedItem; +import net.minecraft.village.VillagerProfession; +import net.minecraft.village.TradeOffer; +import net.minecraft.village.TradeOffers; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.village.VillagerTradesEvent; +import net.neoforged.neoforge.event.village.WandererTradesEvent; + +import java.util.List; + +@EventBusSubscriber(modid = NuggetMod.MOD_ID) +public class ModEvents { + + @SubscribeEvent + public static void addCustomTrades(VillagerTradesEvent event) { + // Add trades to vanilla FARMER profession + if(event.getType() == VillagerProfession.FARMER) { + Int2ObjectMap> trades = event.getTrades(); + + trades.get(1).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 3), + new ItemStack(ModItems.NUGGET.get(), 8), 7, 2, 0.04f)); + } + + // Add trades to custom NUGGETER profession + if(event.getType().equals(ModVillagers.NUGGETER_KEY)) { + Int2ObjectMap> trades = event.getTrades(); + + // Level 1 trades + trades.get(1).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 5), + new ItemStack(ModItems.NUGGET.get(), 20), 4, 7, 0.04f)); + + trades.get(1).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 2), + new ItemStack(ModItems.RAW_NUGGET.get(), 12), 6, 5, 0.05f)); + + // Level 2 trades + trades.get(2).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.GOLD_INGOT, 8), + new ItemStack(ModItems.NUGGET_SWORD.get(), 1), 3, 10, 0.05f)); + + trades.get(2).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 10), + new ItemStack(ModItems.NUGGET_PICKAXE.get(), 1), 3, 10, 0.05f)); + + // Level 3 trades + trades.get(3).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 15), + new ItemStack(ModItems.NUGGET_HELMET.get(), 1), 2, 15, 0.05f)); + + trades.get(3).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 20), + new ItemStack(ModItems.NUGGET_CHESTPLATE.get(), 1), 2, 15, 0.05f)); + + // Level 4 trades + trades.get(4).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 5), + new ItemStack(ModItems.NUGGET_LEGGINGS.get(), 1), 2, 20, 0.05f)); + + trades.get(4).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 12), + new ItemStack(ModItems.NUGGET_BOOTS.get(), 1), 2, 20, 0.05f)); + + // Level 5 trades (Master) + trades.get(5).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 30), + new ItemStack(ModItems.NUGGET_HORSE_ARMOR.get(), 1), 1, 30, 0.1f)); + + trades.get(5).add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 10), + new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 1, 30, 0.1f)); + } + } + + @SubscribeEvent + public static void addWanderingTrades(WandererTradesEvent event) { + List genericTrades = event.getGenericTrades(); + List rareTrades = event.getRareTrades(); + + // Add generic wandering trader trades + genericTrades.add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 12), + new ItemStack(ModItems.NUGGET.get(), 3), 2, 8, 0.2f)); + + // Add rare wandering trader trades + rareTrades.add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.DIAMOND, 8), + new ItemStack(ModItems.NUGGET_MUSIC_DISC.get(), 1), 1, 12, 0.2f)); + + rareTrades.add((level, entity, random) -> new TradeOffer( + new TradedItem(Items.EMERALD, 25), + new ItemStack(ModItems.NUGGET_SMITHING_TEMPLATE.get(), 1), 1, 12, 0.2f)); + } +} + diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/item/ModItemGroups.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/item/ModItemGroups.java index 20c7f90..b45dcb2 100644 --- a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/item/ModItemGroups.java +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/item/ModItemGroups.java @@ -5,21 +5,20 @@ import dev.sillyangel.nuggetmod.block.ModBlocks; import dev.sillyangel.nuggetmod.item.ModItems; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.text.Text; import net.minecraft.util.Identifier; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; public class ModItemGroups { + public static final DeferredRegister CREATIVE_MODE_TABS = + DeferredRegister.create(RegistryKeys.ITEM_GROUP, NuggetMod.MOD_ID); - public static final RegistryKey NUGGET_BLOCKS_GROUP_KEY = RegistryKey.of(RegistryKeys.ITEM_GROUP, - Identifier.of(NuggetMod.MOD_ID, "nugget_blocks")); - - public static final ItemGroup NUGGET_BLOCKS_GROUP = Registry.register(Registries.ITEM_GROUP, - NUGGET_BLOCKS_GROUP_KEY, - ItemGroup.create(ItemGroup.Row.TOP, -1) + public static final Supplier NUGGET_BLOCKS_GROUP = CREATIVE_MODE_TABS.register("nugget_blocks", + () -> ItemGroup.create(ItemGroup.Row.TOP, -1) .icon(() -> new ItemStack(ModBlocks.NUGGET_BLOCK.get())) .displayName(Text.translatable("creativetab.nuggetmod.nugget_blocks")) .entries((displayContext, entries) -> { @@ -29,13 +28,10 @@ public class ModItemGroups { entries.add(ModBlocks.NUGGET_DEEPSLATE_ORE.get()); }).build()); - public static final RegistryKey NUGGET_ITEMS_GROUP_KEY = RegistryKey.of(RegistryKeys.ITEM_GROUP, - Identifier.of(NuggetMod.MOD_ID, "nugget_items")); - - public static final ItemGroup NUGGET_ITEMS_GROUP = Registry.register(Registries.ITEM_GROUP, - NUGGET_ITEMS_GROUP_KEY, - ItemGroup.create(ItemGroup.Row.TOP, -1) + public static final Supplier NUGGET_ITEMS_GROUP = CREATIVE_MODE_TABS.register("nugget_items", + () -> ItemGroup.create(ItemGroup.Row.TOP, -1) .icon(() -> new ItemStack(ModItems.NUGGET.get())) + .withTabsBefore(Identifier.of(NuggetMod.MOD_ID, "nugget_blocks")) .displayName(Text.translatable("creativetab.nuggetmod.nugget_items")) .entries((displayContext, entries) -> { entries.add(ModItems.NUGGET.get()); @@ -58,7 +54,8 @@ public class ModItemGroups { entries.add(ModItems.NUGGET_MUSIC_DISC.get()); }).build()); - public static void registerItemGroups() { + public static void registerItemGroups(IEventBus eventBus) { + CREATIVE_MODE_TABS.register(eventBus); } } diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/ModParticles.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/ModParticles.java index 01811b7..863808e 100644 --- a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/ModParticles.java +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/ModParticles.java @@ -1,20 +1,21 @@ package dev.sillyangel.nuggetmod.neoforge.particle; import dev.sillyangel.nuggetmod.NuggetMod; -import net.minecraft.particle.SimpleParticleType; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; +import net.minecraft.registry.RegistryKeys; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; public class ModParticles { - public static final SimpleParticleType NUGGET_PARTICLE = - registerParticle("nugget_particle", new SimpleParticleType(false)); + public static final DeferredRegister> PARTICLE_TYPES = + DeferredRegister.create(RegistryKeys.PARTICLE_TYPE, NuggetMod.MOD_ID); - private static SimpleParticleType registerParticle(String name, SimpleParticleType particleType) { - return Registry.register(Registries.PARTICLE_TYPE, Identifier.of(NuggetMod.MOD_ID, name), particleType); - } + public static final Supplier NUGGET_PARTICLE = + PARTICLE_TYPES.register("nugget_particle", () -> new net.minecraft.particle.SimpleParticleType(false)); - public static void registerParticles() { + public static void registerParticles(IEventBus eventBus) { + PARTICLE_TYPES.register(eventBus); } } diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/NuggetParticle.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/NuggetParticle.java index dc3ead8..86381ec 100644 --- a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/NuggetParticle.java +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/particle/NuggetParticle.java @@ -7,12 +7,13 @@ import net.minecraft.util.math.random.Random; import org.jetbrains.annotations.Nullable; public class NuggetParticle extends BillboardParticle { - public NuggetParticle(ClientWorld clientWorld, double x, double y, double z, - SpriteProvider spriteProvider, double xSpeed, double ySpeed, double zSpeed) { - super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed, spriteProvider.getFirst()); + protected NuggetParticle(ClientWorld level, double x, double y, double z, SpriteProvider spriteSet, + double xSpeed, double ySpeed, double zSpeed) { + super(level, x, y, z, xSpeed, ySpeed, zSpeed, spriteSet.getSprite(Random.create())); this.velocityMultiplier = 0.8f; - this.maxAge = 40; + this.maxAge = 80; + this.red = 1f; this.green = 1f; this.blue = 1f; @@ -24,17 +25,17 @@ public class NuggetParticle extends BillboardParticle { } public static class Factory implements ParticleFactory { - private final SpriteProvider spriteProvider; + private final SpriteProvider spriteSet; - public Factory(SpriteProvider spriteProvider) { - this.spriteProvider = spriteProvider; + public Factory(SpriteProvider spriteSet) { + this.spriteSet = spriteSet; } @Nullable @Override - public Particle createParticle(SimpleParticleType parameters, ClientWorld world, double x, double y, double z, - double velocityX, double velocityY, double velocityZ, Random random) { - return new NuggetParticle(world, x, y, z, this.spriteProvider, velocityX, velocityY, velocityZ); + public Particle createParticle(SimpleParticleType simpleParticleType, ClientWorld clientLevel, + double pX, double pY, double pZ, double pXSpeed, double pYSpeed, double pZSpeed, Random randomSource) { + return new NuggetParticle(clientLevel, pX, pY, pZ, this.spriteSet, pXSpeed, pYSpeed, pZSpeed); } } } diff --git a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/villager/ModVillagers.java b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/villager/ModVillagers.java index 2ddb9b3..398e9f4 100644 --- a/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/villager/ModVillagers.java +++ b/neoforge/src/main/java/dev/sillyangel/nuggetmod/neoforge/villager/ModVillagers.java @@ -2,8 +2,7 @@ package dev.sillyangel.nuggetmod.neoforge.villager; import com.google.common.collect.ImmutableSet; import dev.sillyangel.nuggetmod.NuggetMod; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; +import dev.sillyangel.nuggetmod.block.ModBlocks; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.sound.SoundEvents; @@ -11,26 +10,33 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.village.VillagerProfession; import net.minecraft.world.poi.PointOfInterestType; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; public class ModVillagers { - public static final RegistryKey NUGGETER_POI_KEY = registerPoiKey("nuggeter_poi"); + public static final DeferredRegister POI_TYPES = + DeferredRegister.create(RegistryKeys.POINT_OF_INTEREST_TYPE, NuggetMod.MOD_ID); + public static final DeferredRegister VILLAGER_PROFESSIONS = + DeferredRegister.create(RegistryKeys.VILLAGER_PROFESSION, NuggetMod.MOD_ID); public static final RegistryKey NUGGETER_KEY = RegistryKey.of(RegistryKeys.VILLAGER_PROFESSION, Identifier.of(NuggetMod.MOD_ID, "nuggeter")); - public static final VillagerProfession NUGGETER = registerProfession("nuggeter", NUGGETER_POI_KEY); + public static final Supplier NUGGETER_POI = POI_TYPES.register("nuggeter_poi", + () -> new PointOfInterestType(ImmutableSet.copyOf(ModBlocks.NUGGET_BLOCK.get().getStateManager().getStates()), 1, 1)); - private static VillagerProfession registerProfession(String name, RegistryKey type) { - return Registry.register(Registries.VILLAGER_PROFESSION, Identifier.of(NuggetMod.MOD_ID, name), - new VillagerProfession(Text.literal("Nuggeter"), entry -> entry.matchesKey(type), entry -> entry.matchesKey(type), - ImmutableSet.of(), ImmutableSet.of(), SoundEvents.ENTITY_VILLAGER_WORK_LIBRARIAN)); - } + public static final Supplier NUGGETER = VILLAGER_PROFESSIONS.register("nuggeter", + () -> new VillagerProfession(Text.literal("Nuggeter"), + holder -> holder.value() == NUGGETER_POI.get(), + poiTypeHolder -> poiTypeHolder.value() == NUGGETER_POI.get(), + ImmutableSet.of(), ImmutableSet.of(), + SoundEvents.ENTITY_VILLAGER_WORK_LIBRARIAN)); - private static RegistryKey registerPoiKey(String name) { - return RegistryKey.of(RegistryKeys.POINT_OF_INTEREST_TYPE, Identifier.of(NuggetMod.MOD_ID, name)); - } - - public static void registerVillagers() { + public static void registerVillagers(IEventBus eventBus) { + POI_TYPES.register(eventBus); + VILLAGER_PROFESSIONS.register(eventBus); } } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index bfa4b68..fc40bad 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -9,9 +9,11 @@ version = "${version}" displayName = "Nugget Mod" authors = "sillyangel" description = ''' -This is an example description! Tell everyone what your mod is about! +A Minecraft mod that brings the meme of Gegagedigedagedago Nugget into the Minecraft. ''' -#logoFile = "" +logoFile = "icon.png" +modUrl="https://modrinth.com/mod/nuggetmod" +displayURL="https://modrinth.com/mod/nuggetmod" [[dependencies.nuggetmod]] modId = "neoforge"