Ported to 1.20.1

RealYusufIsmail-Mc-Mods · Aug 28, 2023 · a273a15 · a273a15
1 parent ad2bb8b
commit a273a15
Show file tree

Hide file tree

Showing 219 changed files with 724 additions and 546 deletions.
diff --git a/.github/workflows/basic-checks.yml b/.github/workflows/basic-checks.yml
@@ -3,7 +3,7 @@ name: Basic checks
 on: [ pull_request ]
 
 env:
-  JAVA_VERSION: 11
+  JAVA_VERSION: 17
   DISTRIBUTION: adopt
 
 jobs:

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -5,9 +5,9 @@ name: Java CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, 1.20.1 ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, 1.20.1 ]
 
 jobs:
   build:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -21,11 +21,11 @@ plugins {
 
 project.group = "io.github.realyusufismail"
 
-project.version = "1.19.4-1.0.1"
+project.version = "1.20.1-1.0.0"
 
 base.archivesName.set("armourandtoolsmod")
 
-val mcVersion = "1.19.4"
+val mcVersion = "1.20.1"
 
 // A project ID is required to tell CurseForge which project the uploaded
 // file belongs to. This is public on your project page and is not private
@@ -41,7 +41,7 @@ println(
         .trimIndent())
 
 configure<UserDevExtension> {
-    mappings("parchment", "1.19.4-2023.06.26-$mcVersion")
+    mappings("parchment", "2023.08.20-$mcVersion")
 
     accessTransformer("src/main/resources/META-INF/accesstransformer.cfg")
 
@@ -138,7 +138,7 @@ repositories {
 }
 
 dependencies {
-    minecraft("net.minecraftforge:forge:1.19.4-45.1.0")
+    minecraft("net.minecraftforge:forge:1.20.1-47.1.0")
     // kotlin forge
     implementation("thedarkcolour:kotlinforforge:4.4.0")
     // Logger
@@ -147,10 +147,7 @@ dependencies {
     // test
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     // core
-    implementation("io.github.realyusufismail:realyusufismailcore:1.19-1.1.2")
-    // Patchouli
-    // compileOnly(fg.deobf("vazkii.patchouli:Patchouli:1.19.3-78:api"))
-    // runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:1.19.3-78"))
+    implementation("io.github.realyusufismail:realyusufismailcore:1.20.1-1.0.1")
     // Json
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
 }

diff --git a/src/generated/resources/.cache/0cf1fbcc3d48b3e57ef3f7c05b035e489fdab1a7 b/src/generated/resources/.cache/0cf1fbcc3d48b3e57ef3f7c05b035e489fdab1a7
@@ -1,3 +1,3 @@
-// 1.19.4	2023-08-27T05:54:31.07048	atlases generator for armourandtoolsmod
+// 1.20.1	2023-08-28T05:16:02.6293286	atlases generator for armourandtoolsmod
 92069d0a9af0dc23693cb381311ec4a576427b49 assets/minecraft/atlases/armor_trims.json
 0dcc23f5ce41513d01611691d31cd5f4aacf7df4 assets/minecraft/atlases/blocks.json
diff --git a/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86 b/src/generated/resources/.cache/0f202e000d40347127b33b6edbbb29689b8cbf86
@@ -1,2 +1,2 @@
-// 1.19.4	2023-07-25T22:05:28.437187	Pack Metadata
-99f2ac445bc7fd70244eabc5d7aff543ea480561 pack.mcmeta
+// 1.20.1	2023-08-28T05:16:02.6338489	Pack Metadata
+acae0febb57eb8aa2269471902f7d4de3e86c288 pack.mcmeta
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.19.4	2023-07-31T21:32:32.393834	Registries
+// 1.20.1	2023-08-28T05:16:02.6283281	Registries
 dff220c6252072f47de109d9b043436b066ac2bd data/armourandtoolsmod/worldgen/configured_feature/aqumarine_ore.json
 7c90240b4f84b84a5e0e4afd9f48d16d655236a7 data/armourandtoolsmod/worldgen/configured_feature/enderite_ore.json
 5c862835bad5b578878f8c5e3329d0326c14be59 data/armourandtoolsmod/worldgen/configured_feature/graphite_ore.json

diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,20 +1,20 @@
-// 1.19.4	2023-07-31T21:17:35.31535	Loot Tables
-978fdd88840e03c72998e627647e105ad3e0cc42 data/armourandtoolsmod/loot_tables/blocks/aqumarine_block.json
-b3efcb91567b5e150bbe3796f56e31212e83de19 data/armourandtoolsmod/loot_tables/blocks/aqumarine_ore.json
-0bef922d20a9a0d8ee0b288c145c46ef91dac291 data/armourandtoolsmod/loot_tables/blocks/custom_armour_crafting_table.json
-6dbc7198f554b06e8c203c5ae263a82c9cf8b0a2 data/armourandtoolsmod/loot_tables/blocks/custom_tool_crafting_table.json
-80d914547bac10ea786e2341d05552df2a10de96 data/armourandtoolsmod/loot_tables/blocks/deepslate_aqumarine_ore.json
-91016faba914273c3b751fcae98316ff16a28511 data/armourandtoolsmod/loot_tables/blocks/deepslate_graphite_ore.json
-66bc52ed3d04517202fdb60b1d7400e4a87573da data/armourandtoolsmod/loot_tables/blocks/deepslate_rainbow_ore.json
-d7d2334744bf327a2075947667ab2a9107384676 data/armourandtoolsmod/loot_tables/blocks/deepslate_ruby_ore.json
-180223335a1454d85bdc0a9cf93364efc0a35e81 data/armourandtoolsmod/loot_tables/blocks/deepslate_sapphire_ore.json
-e5b48fa5327a4f8f13ed86cd2a3ad42318936c9c data/armourandtoolsmod/loot_tables/blocks/enderite_block.json
-4d7f9bae775c17f902eee9bb8a8dfc05f002f777 data/armourandtoolsmod/loot_tables/blocks/enderite_ore.json
-39244c1274bfecdd74689451804e1423dea90c9e data/armourandtoolsmod/loot_tables/blocks/graphite_block.json
-fad58676920b01badeeb3b925f6f45a3ef134ce3 data/armourandtoolsmod/loot_tables/blocks/graphite_ore.json
-b47f772bc33d4d6fc159c8255ad23b0bee017f4c data/armourandtoolsmod/loot_tables/blocks/rainbow_block.json
-47c36f3dfdfae6d870957126c82ef85d3eaac29e data/armourandtoolsmod/loot_tables/blocks/rainbow_ore.json
-1f8ddc5bd40307f2350d43b1d80bf5d2da5acb5d data/armourandtoolsmod/loot_tables/blocks/ruby_block.json
-ce00295d2904c31c3662ed230b14f12bf890edec data/armourandtoolsmod/loot_tables/blocks/ruby_ore.json
-5784a047e7fc9b350d1dd1316a5d2266de9f2680 data/armourandtoolsmod/loot_tables/blocks/sapphire_block.json
-9c008cffd04b236d0a2bbca31dbf36b21cdb8a84 data/armourandtoolsmod/loot_tables/blocks/sapphire_ore.json
+// 1.20.1	2023-08-28T05:16:02.6192725	Loot Tables
+2898515efda3fb01ac7eb6337875f6310869a683 data/armourandtoolsmod/loot_tables/blocks/aqumarine_block.json
+1efb52b906488da11f7948ed6a21285c1ae085c5 data/armourandtoolsmod/loot_tables/blocks/aqumarine_ore.json
+0f854404a05c040106f826bf3e6eb1debb2b8513 data/armourandtoolsmod/loot_tables/blocks/custom_armour_crafting_table.json
+56189365fbfbeedbc9086e95af54637dc1288e25 data/armourandtoolsmod/loot_tables/blocks/custom_tool_crafting_table.json
+037852d2164bc89fdf7eec7ca820d976bfb8cf00 data/armourandtoolsmod/loot_tables/blocks/deepslate_aqumarine_ore.json
+052b565467fcb498276abcd82329fa8e9f3dac0c data/armourandtoolsmod/loot_tables/blocks/deepslate_graphite_ore.json
+5b1d35ef7749092a2048ab38bc74861db42d08d9 data/armourandtoolsmod/loot_tables/blocks/deepslate_rainbow_ore.json
+353b1fcc43692ef4d531d28725c0cbae9f21beed data/armourandtoolsmod/loot_tables/blocks/deepslate_ruby_ore.json
+5152d7bfc26caa8fbafd7d728a3bde94f17071f1 data/armourandtoolsmod/loot_tables/blocks/deepslate_sapphire_ore.json
+ee3c7cea455b43662bb85c65ba097a66fad15e2b data/armourandtoolsmod/loot_tables/blocks/enderite_block.json
+0a1baaef0c26d8186cfebd9b5f7e8a319d14187d data/armourandtoolsmod/loot_tables/blocks/enderite_ore.json
+baf5c9934dbe9336e2362956ea6223cd4f067fd5 data/armourandtoolsmod/loot_tables/blocks/graphite_block.json
+4e4d7f9e13f901fe3ae5ca406313f683dda24fbb data/armourandtoolsmod/loot_tables/blocks/graphite_ore.json
+be352efe18892a6d569480eb2c34423ab7e8f199 data/armourandtoolsmod/loot_tables/blocks/rainbow_block.json
+8c9c9a72eb8e8424e527174afee3bee8f54a6c0d data/armourandtoolsmod/loot_tables/blocks/rainbow_ore.json
+1b4f1728a73c79f1834e8d896bd7af391a8782ac data/armourandtoolsmod/loot_tables/blocks/ruby_block.json
+ed3c7d1f7fedc5688d4dcf31077a4e63f4ec7fbc data/armourandtoolsmod/loot_tables/blocks/ruby_ore.json
+bfde61d2e085f59841a4bccd2e778b69724ab7d7 data/armourandtoolsmod/loot_tables/blocks/sapphire_block.json
+1703272b6ddef86dc925308454f31eed0a409af7 data/armourandtoolsmod/loot_tables/blocks/sapphire_ore.json
diff --git a/src/generated/resources/.cache/9cedfe5b9b9b8fb51ee0cbcde6ee21cf9da7c57c b/src/generated/resources/.cache/9cedfe5b9b9b8fb51ee0cbcde6ee21cf9da7c57c
@@ -1,4 +1,4 @@
-// 1.19.4	2023-07-31T21:17:35.313154	Tags for minecraft:block mod id armourandtoolsmod
+// 1.20.1	2023-08-28T05:16:02.6122709	Tags for minecraft:block mod id armourandtoolsmod
 f4e0d28b203a60fd241885a727654636c8762650 data/forge/tags/blocks/deepslate_ores/aqumarine_ores.json
 186e50e522fb2ae91c6e315a523523796b105b56 data/forge/tags/blocks/deepslate_ores/graphite_ores.json
 d66c065dfb98375b77835223afe692a26c7be84b data/forge/tags/blocks/deepslate_ores/rainbow_ores.json

diff --git a/src/generated/resources/.cache/9f61bb65fbe4cfb8a15e0d3253c99409d3dd169b b/src/generated/resources/.cache/9f61bb65fbe4cfb8a15e0d3253c99409d3dd169b
@@ -1,4 +1,4 @@
-// 1.19.4	2023-08-25T23:43:21.1002633	Item Models: armourandtoolsmod
+// 1.20.1	2023-08-28T05:16:02.617272	Item Models: armourandtoolsmod
 f523d3f594a0d1a51fb553f028ab2b20eee793dd assets/armourandtoolsmod/models/item/amethyst_boots.json
 8377e984c59ebdaa220b7d1c0973dfd4653e52fb assets/armourandtoolsmod/models/item/amethyst_chestplate.json
 8895d7116f5e4183fe38d01164721842ede9d5f1 assets/armourandtoolsmod/models/item/amethyst_helmet.json