Merge branch 'downgrade/1.18.2' into version/1.18.2

.github/workflows/build_and_publish.yaml

@@ -81,7 +81,7 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v4
         if: ${{ steps.get_release_type.outputs.result != 'test' }}
         with:
-          branch: version/1.19.2
+          branch: version/1.18.2
           commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
           file_pattern: CHANGELOG.md
       - name: Upload to Curseforge
@@ -98,7 +98,7 @@ jobs:
             ${{ steps.changelog.outputs.changes }}
 
             Find changes for all versions at https://github.com/klikli-dev/theurgy/releases
-          game_versions: Forge,Minecraft 1.19:1.19,Minecraft 1.19:1.19.1,Minecraft 1.19:${{ steps.get_mc_version.outputs.result }}
+          game_versions: Forge,Minecraft 1.18:${{ steps.get_mc_version.outputs.result }}
           display_name: theurgy-${{ steps.get_mc_version.outputs.result }}-${{ steps.get_version.outputs.result }}.jar
           release_type: ${{ steps.get_release_type.outputs.result }}
           relations: modonomicon:requiredDependency,jei:optionalDependency

build.gradle

@@ -133,9 +133,8 @@ dependencies {
     minecraft "net.minecraftforge:forge:${forge_version}"
 
     //Jei
-    compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}")
-    compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}")
-    runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")
+    compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}:api")
+    runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}:${jei_version}")
 
     compileOnly fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}") //we build against full jar because we NEED IT ALL
     runtimeOnly fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}")

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mod_version=0.0.1
-mc_version=1.19.2
+mc_version=1.18.2
 
-forge_version=1.19.2-43.2.1
+forge_version=1.18.2-40.1.92
 
 mapping_channel=parchment
 #postfix is target mc version, optional prefix is source parchment mc version
-mapping_version=2022.11.27-1.19.2
+mapping_version=2022.09.04-1.18.2
 
-jei_mc_version=1.19.2
-jei_version=11.4.0.290
+jei_mc_version=1.18.2
+jei_version=9.7.1.255
 
-modonomicon_mc_version=1.19.2
+modonomicon_mc_version=1.18.2
 modonomicon_version=1.21.1

src/generated/resources/.cache/cache

@@ -0,0 +1,21 @@
+7abf73c9cacad4d3243cba786fbee5c9f7ba4f14 assets/theurgy/lang/en_us.json
+336a0ac2406c9bf0028b83740fe3599614678217 assets/theurgy/models/item/alchemical_sulfur.json
+9a4c349e3ca0a4beb0c663739485bddca0f45d2a assets/theurgy/models/item/divination_rod_t1.json
+35524d988d57396ce4ab4ad4851cfd5c6db161e9 assets/theurgy/models/item/divination_rod_t1_0.json
+2946b1369e1b3e9b80dba314ec8e6d51d861f392 assets/theurgy/models/item/divination_rod_t1_1.json
+1943b91ee0511a4bd9779b69b814ebd548d5683d assets/theurgy/models/item/divination_rod_t1_2.json
+02e5eca59d916979bfb709caa29fb1b17ba99a79 assets/theurgy/models/item/divination_rod_t1_3.json
+76d0d4903c7ae0eaefdb12baea3e4ef37948c0a7 assets/theurgy/models/item/divination_rod_t1_4.json
+e2e262d9f8e834414ef81b7b765e65c222282a55 assets/theurgy/models/item/divination_rod_t1_5.json
+07a98152e2f72ad4998bf71ec641bfa05768329a assets/theurgy/models/item/divination_rod_t1_6.json
+ab8e86fe541d97beff8c4f5534cc2bfc388cd560 assets/theurgy/models/item/divination_rod_t1_7.json
+e3ac2b748017ffd6595f0ee85749e7d59ad6a089 assets/theurgy/models/item/divination_rod_t1_searching.json
+7da9b6d12ede3631f8e1a7b5a7c722b9c711f36b assets/theurgy/models/item/empty_jar.json
+fb4994f9fe0e6f2040351bc0ee84a1243b302d76 assets/theurgy/models/item/empty_jar_labeled.json
+b4f655de29e1d825a2e6f79100bea74874d1cb5a assets/theurgy/models/item/jar_label.json
+bb0be9c035be92b94b11baee95360e1d5b676cec assets/theurgy/models/item/the_hermetica_icon.json
+d53b5a95007ac5391d389e80712ce3db949926a3 data/theurgy/modonomicon/books/the_hermetica/book.json
+2534cbcdd4c2d796da75d32260c11cfd11742a2a data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
+114c0c4202ac12133895b147413ed5da59149684 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/about_mod.json
+4cb6f76baccc54b8616d3f9c7fa3553791494c45 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/divination_rod.json
+b42621b92894e279bcf439a333b89a424219ef21 data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/intro.json

src/generated/resources/assets/theurgy/lang/en_us.json

@@ -32,23 +32,23 @@
   "item.theurgy.divination_rod_t1": "Glass Divination Rod",
   "item.theurgy.divination_rod_t1.linked": "Glass Divination Rod %s",
   "item.theurgy.divination_rod_t1.tooltip.extended": "Divination rods can be attuned to a block and are then used to find other blocks of the same type.",
-  "item.theurgy.divination_rod_t1.tooltip.usage": "§aShift-Click§7 a block to attune the rod to it.\n§aRight-Click and hold§7to let the rod search for blocks.\n§aRight-Click without holding§7 after a successful search to let the rod show the last found block without consuming durability.",
+  "item.theurgy.divination_rod_t1.tooltip.usage": "\u00A7aShift-Click\u00A77 a block to attune the rod to it.\n\u00A7aRight-Click and hold\u00A77to let the rod search for blocks.\n\u00A7aRight-Click without holding\u00A77 after a successful search to let the rod show the last found block without consuming durability.",
   "item.theurgy.empty_jar": "Empty Jar",
   "item.theurgy.empty_jar_labeled": "Labeled Empty Jar",
   "item.theurgy.empty_jar_labeled.tooltip": "Dummy item for rendering Alchemical Sulfur if source items are not shown.",
   "item.theurgy.jar_label": "Jar Label",
   "item.theurgy.jar_label.tooltip": "Dummy item for rendering Alchemical Sulfur if source items are shown.",
   "itemGroup.theurgy": "Theurgy",
-  "message.theurgy.divination_rod.attuning_not_allowed": "§4Warning§r: This type of divination rod cannot be manually attuned.",
-  "message.theurgy.divination_rod.block_disallowed": "§4Warning§r: The divination rod cannot be attuned to this type of block: %s.",
-  "message.theurgy.divination_rod.block_not_allowed": "§4Warning§r: The divination rod cannot be attuned to this type of block: %s.",
-  "message.theurgy.divination_rod.linked": "§aSuccess§r: The divination rod is now attuned to %s.",
+  "message.theurgy.divination_rod.attuning_not_allowed": "\u00A74Warning\u00A7r: This type of divination rod cannot be manually attuned.",
+  "message.theurgy.divination_rod.block_disallowed": "\u00A74Warning\u00A7r: The divination rod cannot be attuned to this type of block: %s.",
+  "message.theurgy.divination_rod.block_not_allowed": "\u00A74Warning\u00A7r: The divination rod cannot be attuned to this type of block: %s.",
+  "message.theurgy.divination_rod.linked": "\u00A7aSuccess\u00A7r: The divination rod is now attuned to %s.",
   "message.theurgy.divination_rod.no_link": "The divination rod is not attuned to any material.",
-  "message.theurgy.divination_rod.tier_too_low": "§4Warning§r: You need a higher tier divination rod to attune to %s.",
+  "message.theurgy.divination_rod.tier_too_low": "\u00A74Warning\u00A7r: You need a higher tier divination rod to attune to %s.",
   "theurgy.subtitle.tuning_fork": "Using Divination Rod",
   "tooltip.theurgy..divination_rod.last_result": "Found %s at %s.",
   "tooltip.theurgy..divination_rod.linked_to": "The divination rod is attuned to %s",
-  "tooltip.theurgy..divination_rod.no_link": "The divination rod is §cnot attuned§r to any material.",
-  "tooltip.theurgy.show_extended": "§6[§dshift §7read more§6]",
-  "tooltip.theurgy.show_usage": "§6[§dctrl §7show usage§6]"
+  "tooltip.theurgy..divination_rod.no_link": "The divination rod is \u00A7cnot attuned\u00A7r to any material.",
+  "tooltip.theurgy.show_extended": "\u00A76[\u00A7dshift \u00A77read more\u00A76]",
+  "tooltip.theurgy.show_usage": "\u00A76[\u00A7dctrl \u00A77show usage\u00A76]"
 }

src/generated/resources/assets/theurgy/models/item/divination_rod_t1.json

@@ -2,58 +2,58 @@
   "parent": "theurgy:item/divination_rod_t1_0",
   "overrides": [
     {
-      "model": "theurgy:item/divination_rod_t1_7",
       "predicate": {
         "theurgy:divination_distance": 0.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_7"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_6",
       "predicate": {
         "theurgy:divination_distance": 1.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_6"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_5",
       "predicate": {
         "theurgy:divination_distance": 2.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_5"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_4",
       "predicate": {
         "theurgy:divination_distance": 3.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_4"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_3",
       "predicate": {
         "theurgy:divination_distance": 4.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_3"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_2",
       "predicate": {
         "theurgy:divination_distance": 5.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_2"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_1",
       "predicate": {
         "theurgy:divination_distance": 6.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_1"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_0",
       "predicate": {
         "theurgy:divination_distance": 7.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_0"
     },
     {
-      "model": "theurgy:item/divination_rod_t1_searching",
       "predicate": {
         "theurgy:divination_distance": 8.0
-      }
+      },
+      "model": "theurgy:item/divination_rod_t1_searching"
     }
   ]
 }

src/generated/resources/data/theurgy/modonomicon/books/the_hermetica/book.json

@@ -1,12 +1,12 @@
 {
-  "auto_add_read_conditions": true,
-  "book_content_texture": "modonomicon:textures/gui/book_content.png",
+  "name": "book.theurgy.the_hermetica.name",
+  "tooltip": "book.theurgy.the_hermetica.tooltip",
+  "model": "theurgy:the_hermetica_icon",
+  "creative_tab": "modonomicon",
   "book_overview_texture": "modonomicon:textures/gui/book_overview.png",
+  "book_content_texture": "modonomicon:textures/gui/book_content.png",
   "crafting_texture": "modonomicon:textures/gui/crafting_textures.png",
-  "creative_tab": "modonomicon",
   "default_title_color": 0,
-  "generate_book_item": true,
-  "model": "theurgy:the_hermetica_icon",
-  "name": "book.theurgy.the_hermetica.name",
-  "tooltip": "book.theurgy.the_hermetica.tooltip"
+  "auto_add_read_conditions": true,
+  "generate_book_item": true
 }

src/generated/resources/data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json

@@ -1,8 +1,8 @@
 {
+  "name": "book.theurgy.the_hermetica.getting_started.name",
+  "icon": "theurgy:the_hermetica_icon",
+  "sort_number": 1,
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
-  "icon": "theurgy:the_hermetica_icon",
-  "name": "book.theurgy.the_hermetica.getting_started.name",
-  "show_category_button": true,
-  "sort_number": 1
+  "show_category_button": true
 }

src/generated/resources/data/theurgy/modonomicon/books/the_hermetica/entries/getting_started/about_mod.json

@@ -1,53 +1,53 @@
 {
-  "background_u_index": 0,
-  "background_v_index": 0,
   "category": "theurgy:getting_started",
+  "name": "book.theurgy.the_hermetica.getting_started.about_mod.name",
   "description": "book.theurgy.the_hermetica.getting_started.about_mod.description",
-  "hide_while_locked": false,
   "icon": "minecraft:nether_star",
-  "name": "book.theurgy.the_hermetica.getting_started.about_mod.name",
+  "x": -7,
+  "y": 2,
+  "background_u_index": 0,
+  "background_v_index": 0,
+  "hide_while_locked": false,
+  "parents": [
+    {
+      "entry": "theurgy:getting_started/intro",
+      "draw_arrow": true,
+      "line_enabled": true,
+      "line_reversed": false
+    }
+  ],
   "pages": [
     {
       "type": "modonomicon:text",
       "anchor": "",
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.getting_started.about_mod.about.text",
       "title": "book.theurgy.the_hermetica.getting_started.about_mod.about.title",
-      "use_markdown_in_title": false
+      "use_markdown_in_title": false,
+      "show_title_separator": true,
+      "text": "book.theurgy.the_hermetica.getting_started.about_mod.about.text"
     },
     {
       "type": "modonomicon:text",
       "anchor": "",
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.getting_started.about_mod.about2.text",
       "title": "",
-      "use_markdown_in_title": false
+      "use_markdown_in_title": false,
+      "show_title_separator": true,
+      "text": "book.theurgy.the_hermetica.getting_started.about_mod.about2.text"
     },
     {
       "type": "modonomicon:text",
       "anchor": "",
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.getting_started.about_mod.features.text",
       "title": "book.theurgy.the_hermetica.getting_started.about_mod.features.title",
-      "use_markdown_in_title": false
+      "use_markdown_in_title": false,
+      "show_title_separator": true,
+      "text": "book.theurgy.the_hermetica.getting_started.about_mod.features.text"
     },
     {
       "type": "modonomicon:text",
       "anchor": "",
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.getting_started.about_mod.features2.text",
       "title": "book.theurgy.the_hermetica.getting_started.about_mod.features2.title",
-      "use_markdown_in_title": false
-    }
-  ],
-  "parents": [
-    {
-      "draw_arrow": true,
-      "entry": "theurgy:getting_started/intro",
-      "line_enabled": true,
-      "line_reversed": false
+      "use_markdown_in_title": false,
+      "show_title_separator": true,
+      "text": "book.theurgy.the_hermetica.getting_started.about_mod.features2.text"
     }
-  ],
-  "x": -7,
-  "y": 2
+  ]
 }