first merge

Fabricators-of-Create · Sep 21, 2024 · 04ef4d5 · 04ef4d5
2 parents 7cd0498 + 2e08feb
commit 04ef4d5
Show file tree

Hide file tree

Showing 62 changed files with 2,099 additions and 797 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,33 +1,35 @@
-name: build
-on: [ pull_request, push ]
+name: Build
+
+on: [workflow_dispatch, push, pull_request]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        java: [ 17 ]
     runs-on: ubuntu-latest
-    env:
-      PUBLISH_SUFFIX: snapshots
-      MAVEN_USER: ${{ secrets.MAVEN_USER }}
-      MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
     steps:
-      - name: checkout repository
-        uses: actions/checkout@v2
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        run: echo "JAVA_HOME=$JAVA_HOME_21_X64" >> "$GITHUB_ENV"
 
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v1
+      - name: NeoGradle Cache
+        uses: actions/cache@v4
         with:
-          java-version: ${{ matrix.java }}
+          path: "**/.gradle/repositories/"
+          key: "${{ runner.os }}-gradle-${{ hashFiles('**/libs.versions.*', '**/*.gradle*', '**/gradle-wrapper.properties') }}"
+          restore-keys: "${{ runner.os }}-gradle-"
 
-      - name: make gradle wrapper executable
-        run: chmod +x ./gradlew
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          gradle-home-cache-cleanup: true
 
-      - name: build
-        run: ./gradlew buildOrPublish
+      - name: Validate Gradle Wrapper Integrity
+        uses: gradle/wrapper-validation-action@v2
 
-      - name: capture build artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: Artifacts
-          path: build/libs/
+      - name: Build & Publish to Maven
+        env:
+          PUBLISH_SUFFIX: snapshots
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+        run: ./gradlew buildOrPublish
diff --git a/build.gradle b/build.gradle
@@ -21,26 +21,22 @@ version = version.replace("<patch>", patch)
 repositories {
     mavenLocal()
     maven { url = "https://maven.parchmentmc.org" }
-    maven { url = "https://maven.quiltmc.org/repository/release" }
-    maven { url = "https://repo.maven.apache.org/maven2" }
     maven { url = "https://mvn.devos.one/snapshots" }
 }
 
 dependencies {
     minecraft("com.mojang:minecraft:${project.minecraft_version}")
     mappings(loom.layered {
-        it.mappings("org.quiltmc:quilt-mappings:${project.minecraft_version}+build.${project.qm_version}:intermediary-v2")
         it.officialMojangMappings { nameSyntheticMembers = false }
+        it.parchment("org.parchmentmc.data:parchment-$parchment_minecraft_version:$parchment_version@zip")
     })
     modImplementation("net.fabricmc:fabric-loader:${project.loader_version}")
 
     modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
     modApi(include(fabricApi.module("fabric-data-generation-api-v1", project.fabric_version))) // include datagen api
     modApi(include("io.github.fabricators_of_create.Porting-Lib:tags:${project.porting_lib_version}")) { exclude(group: "io.vram") }
-    modApi(include("io.github.fabricators_of_create.Porting-Lib:model_generators:${project.porting_lib_version}")) { exclude(group: "io.vram") }
+    //modApi(include("io.github.fabricators_of_create.Porting-Lib:model_generators:${project.porting_lib_version}")) { exclude(group: "io.vram") }
     modApi(include("io.github.fabricators_of_create.Porting-Lib:data:${project.porting_lib_version}")) { exclude(group: "io.vram") }
-    implementation(include("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}"))
-    annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixin_extras_version}")
 
     compileOnly("org.projectlombok:lombok:1.18.22")
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,16 @@
-org.gradle.jvmargs = -Xmx1G
+# Setup gradle memory
+org.gradle.jvmargs=-Xmx2G
+org.gradle.daemon=false
+org.gradle.caching=true
 
 # filled in at build
 mod_version = 1.3.<patch>
-minecraft_version = 1.20.1
-loader_version = 0.14.25
-fabric_version = 0.86.0+1.20.1
-porting_lib_version = 2.1.1090+1.20
-mixin_extras_version = 0.3.6
+minecraft_version = 1.21.1
+loader_version = 0.16.5
+fabric_version = 0.104.0+1.21.1
+porting_lib_version = 3.1.0-beta-beta.35+1.21
 
 # Mappings
-# https://lambdaurora.dev/tools/import_quilt.html
-qm_version = 21
+# https://parchmentmc.org/docs/getting-started
+parchment_minecraft_version = 1.21
+parchment_version = 2024.07.28
diff --git a/settings.gradle b/settings.gradle
@@ -1,11 +1,8 @@
 pluginManagement {
     repositories {
-        maven { url = "https://maven.quiltmc.org/repository/release" }
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
         gradlePluginPortal()
+        maven { url = 'https://maven.fabricmc.net/' }
     }
 }
+
 rootProject.name = 'Registrate'
diff --git a/src/generated/resources/.cache/f2b3a4d49e8c8c161e4994c40ded98635f9ee697 b/src/generated/resources/.cache/f2b3a4d49e8c8c161e4994c40ded98635f9ee697
@@ -0,0 +1,33 @@
+// 1.21	2024-06-18T14:08:25.721002733	Registrate Provider for testmod [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), generic_server_provider, Blockstates, Item models, Lang (en_us/en_ud), generic_client_provider]
+353e0134b90278ff49840165bed05cb48e7fff1b assets/testmod/blockstates/magic_item_model.json
+bc6ecd9ef8452b21567c005ab9c626c54a1beeaa assets/testmod/blockstates/testblock.json
+069fa0cc9495cbad97a129b3e39bd0bdf0599b28 assets/testmod/blockstates/testfluid.json
+8aa1ccb718ab04625be00169e218bc4589d85d4a assets/testmod/lang/en_ud.json
+e19f2dcc2fab5a1f0022e624ff93ef10a2dea7d6 assets/testmod/lang/en_us.json
+b3c7ac87f735c9813d09ee46f1d26c844c06353c assets/testmod/models/block/subfolder/magic_item_model.json
+226ecfcb53fb775aa96f550dcc41bc44c026127f assets/testmod/models/block/testblock.json
+c73682ddea9998e48415b962e3c3b1d2dcc6157a assets/testmod/models/block/testfluid.json
+35c5c8cdd34da12756a7651f2da42ce019a5684a assets/testmod/models/item/magic_item_model.json
+e7327feaec0ea15c7f4f5cc4e012f4ff08284df8 assets/testmod/models/item/testblock.json
+63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/testmod/models/item/testentity_spawn_egg.json
+fb63fdeef603a7edf02010fc963c89e2d41931b6 assets/testmod/models/item/testitem.json
+6cde7304ac9429b0ea7e01078b4846b1cac6a0c8 data/minecraft/tags/block/bamboo_plantable_on.json
+6cde7304ac9429b0ea7e01078b4846b1cac6a0c8 data/minecraft/tags/block/dragon_immune.json
+6cde7304ac9429b0ea7e01078b4846b1cac6a0c8 data/minecraft/tags/block/wither_immune.json
+ed4dc1c2e1c580f129c041ffd8fcfae1424366a2 data/minecraft/tags/entity_type/raiders.json
+e9cec2088093803c7eb2f88bd11693cd261a8e41 data/minecraft/tags/item/beds.json
+23c099bc7a19249c4e3c653b0e2a5090dd78d617 data/testmod/advancement/recipes/misc/diamond_block_from_testblock_campfire.json
+de60acb72ee4d5ae78269c08778cc1261b4bf7a5 data/testmod/advancement/recipes/misc/diamond_block_from_testblock_smelting.json
+680c921a5c8f490f55bd2b2164d7044d452cec94 data/testmod/advancement/recipes/misc/diamond_block_from_testblock_smoking.json
+3b6b7ae16a271d643be2ae05627864c6d25eab6a data/testmod/advancement/recipes/misc/testblock.json
+4669bf929a45d650a4f519adc826e8a942f1aaa7 data/testmod/advancements/root.json
+d1031daf0999a74446a7fc78f202681ba1e0e5e3 data/testmod/dimension/test_dimension.json
+a980994c32dc4a6ba29ab209881ddff6e859ce48 data/testmod/dimension_type/test_dimension_type.json
+ee89292168589e280e0ebaa8cb184635f91d0751 data/testmod/loot_table/blocks/magic_item_model.json
+fbce6908b10760b8883cd088752816f73cb3c6d2 data/testmod/loot_table/blocks/testblock.json
+95c566cb5ec0e92933483b2efd54057bb20ca2e2 data/testmod/loot_table/entities/testentity.json
+0e7acafac1d515be8f28a317bc805c9316b84885 data/testmod/loot_table/entities/testitem.json
+927f12c055a74442b08c8b5cf3275164524ae5f6 data/testmod/recipe/diamond_block_from_testblock_campfire.json
+ab4f412688e8ef1898f757751e11f23980a7a9ad data/testmod/recipe/diamond_block_from_testblock_smelting.json
+ed2caf0c47f309ec4a4d455817b3897937cae63a data/testmod/recipe/diamond_block_from_testblock_smoking.json
+c1b10f0ff2f526ac6fc0bd0071a86e2976f4555e data/testmod/recipe/testblock.json
diff --git a/src/generated/resources/data/testmod/dimension/test_dimension.json b/src/generated/resources/data/testmod/dimension/test_dimension.json
@@ -0,0 +1,11 @@
+{
+  "type": "testmod:test_dimension_type",
+  "generator": {
+    "type": "minecraft:noise",
+    "biome_source": {
+      "type": "minecraft:fixed",
+      "biome": "minecraft:plains"
+    },
+    "settings": "minecraft:overworld"
+  }
+}
diff --git a/src/generated/resources/data/testmod/dimension_type/test_dimension_type.json b/src/generated/resources/data/testmod/dimension_type/test_dimension_type.json
@@ -0,0 +1,23 @@
+{
+  "ambient_light": 0.0,
+  "bed_works": true,
+  "coordinate_scale": 1.0,
+  "effects": "minecraft:overworld",
+  "has_ceiling": false,
+  "has_raids": true,
+  "has_skylight": true,
+  "height": 384,
+  "infiniburn": "#minecraft:infiniburn_overworld",
+  "logical_height": 384,
+  "min_y": -64,
+  "monster_spawn_block_light_limit": 0,
+  "monster_spawn_light_level": {
+    "type": "minecraft:uniform",
+    "max_inclusive": 7,
+    "min_inclusive": 0
+  },
+  "natural": true,
+  "piglin_safe": false,
+  "respawn_anchor_works": false,
+  "ultrawarm": false
+}
diff --git a/src/generated/resources/data/testmod/recipe/diamond_block_from_testblock_campfire.json b/src/generated/resources/data/testmod/recipe/diamond_block_from_testblock_campfire.json
@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:campfire_cooking",
+  "category": "food",
+  "cookingtime": 600,
+  "experience": 1.0,
+  "ingredient": {
+    "type": "testmod:data_ingredient",
+    "parent": {
+      "item": "testmod:testblock"
+    },
+    "criteria": [
+      {
+        "items": "testmod:testblock"
+      }
+    ],
+    "id": "testmod:testblock"
+  },
+  "result": {
+    "count": 1,
+    "id": "minecraft:diamond_block"
+  }
+}
diff --git a/src/generated/resources/data/testmod/recipe/diamond_block_from_testblock_smelting.json b/src/generated/resources/data/testmod/recipe/diamond_block_from_testblock_smelting.json
@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:smelting",
+  "category": "blocks",
+  "cookingtime": 200,
+  "experience": 1.0,
+  "ingredient": {
+    "type": "testmod:data_ingredient",
+    "parent": {
+      "item": "testmod:testblock"
+    },
+    "criteria": [
+      {
+        "items": "testmod:testblock"
+      }
+    ],
+    "id": "testmod:testblock"
+  },
+  "result": {
+    "count": 1,
+    "id": "minecraft:diamond_block"
+  }
+}
diff --git a/src/generated/resources/data/testmod/recipe/diamond_block_from_testblock_smoking.json b/src/generated/resources/data/testmod/recipe/diamond_block_from_testblock_smoking.json
@@ -0,0 +1,22 @@
+{
+  "type": "minecraft:smoking",
+  "category": "food",
+  "cookingtime": 100,
+  "experience": 1.0,
+  "ingredient": {
+    "type": "testmod:data_ingredient",
+    "parent": {
+      "item": "testmod:testblock"
+    },
+    "criteria": [
+      {
+        "items": "testmod:testblock"
+      }
+    ],
+    "id": "testmod:testblock"
+  },
+  "result": {
+    "count": 1,
+    "id": "minecraft:diamond_block"
+  }
+}