feat: update to 1.19.4

.github/workflows/build_and_publish.yaml

@@ -73,7 +73,7 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v4
         if: ${{ steps.get_release_type.outputs.result != 'test' }}
         with:
-          branch: version/1.19.3
+          branch: version/1.19.4
           commit_message: 'docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]'
           file_pattern: CHANGELOG.md
       - name: Upload to Curseforge

.gitignore

@@ -28,4 +28,5 @@ logs/
 
 src/generated/resources/.cache/
 
-runtime-mods/
+# local flatDir maven repo
+lib/

build.gradle

@@ -135,14 +135,21 @@ repositories {
             includeGroup "com.ldtteam"
         }
     }
+    maven {
+        name = "SBL Maven"
+        url "https://dl.cloudsmith.io/public/tslat/sbl/maven/"
+        content {
+            includeGroup "net.tslat.smartbrainlib"
+        }
+    }
     maven {
         url "https://cursemaven.com"
         content {
             includeGroup "curse.maven"
         }
     }
     flatDir {
-        dirs 'runtime-mods'
+        dirs 'lib'
     }
 }
 
@@ -165,12 +172,11 @@ dependencies {
     implementation fg.deobf("software.bernie.geckolib:geckolib-forge-${geckolib_mc_version}:${geckolib_version}")
 
     //smartbrainlib
-    implementation fg.deobf("curse.maven:smartbrainlib-661293:${smartbrainlib_file_id}-sources-${smartbrainlib_src_file_id}")
+    implementation fg.deobf("net.tslat.smartbrainlib:SmartBrainLib-forge-${smartbrainlib_mc_version}:${smartbrainlib_version}")
 
     //almostunified
     compileOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
     runtimeOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
-
 
     //modonomicon
     implementation fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}") //we build against full jar because we NEED IT ALL

gradle.properties

@@ -4,29 +4,27 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mod_version=0.0.1
-mc_version=1.19.3
-forge_version=1.19.3-44.1.8
+mc_version=1.19.4
+forge_version=1.19.4-45.0.43
 
 mapping_channel=parchment
 #postfix is target mc version, optional prefix is source parchment mc version
-mapping_version=2022.12.18-1.19.3
+mapping_version=1.19.3-2023.03.12-1.19.4
 
-jei_mc_version=1.19.3
-jei_version=12.1.1.13
-curios_mc_version=1.19.3
-curios_version=5.1.1.2
-geckolib_mc_version=1.19.3
-geckolib_version=4.0.2
+jei_mc_version=1.19.4
+jei_version=13.0.0.1
+curios_mc_version=1.19.4
+curios_version=5.1.4.2
+geckolib_mc_version=1.19.4
+geckolib_version=4.1.2
+smartbrainlib_mc_version=1.19.4
+smartbrainlib_version=1.9
 
-# SmartBrainLib v1.8
-smartbrainlib_file_id=4312180
-smartbrainlib_src_file_id=4312182
+# Almost Unified vTODO
+almostunified_version=1.19.4-0.3.8
 
-# Almost Unified v0.3.4
-almostunified_version=1.19.3-0.3.4
+modonomicon_mc_version=1.19.4
+modonomicon_version=1.30.1
 
-modonomicon_mc_version=1.19.3
-modonomicon_version=1.25.0
-
-theurgy_mc_version=1.19.3
-theurgy_version=1.1.1
+theurgy_mc_version=1.19.4
+theurgy_version=1.3.0

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/book.json

@@ -5,12 +5,55 @@
   "book_text_offset_width": 0,
   "book_text_offset_x": 0,
   "book_text_offset_y": 0,
+  "bottom_frame_overlay": {
+    "frame_height": 8,
+    "frame_width": 72,
+    "frame_x_offset": 0,
+    "frame_y_offset": -4,
+    "texture": "modonomicon:textures/gui/book_frame_bottom_overlay.png",
+    "texture_height": 256,
+    "texture_width": 256
+  },
+  "category_button_icon_scale": 1.0,
+  "category_button_x_offset": 0,
+  "category_button_y_offset": 0,
   "crafting_texture": "occultism:textures/gui/book/crafting_textures.png",
   "creative_tab": "modonomicon:modonomicon",
   "custom_book_item": "occultism:dictionary_of_spirits",
   "default_title_color": 0,
+  "frame_texture": "modonomicon:textures/gui/book_frame.png",
   "generate_book_item": false,
+  "left_frame_overlay": {
+    "frame_height": 70,
+    "frame_width": 7,
+    "frame_x_offset": 3,
+    "frame_y_offset": 0,
+    "texture": "modonomicon:textures/gui/book_frame_left_overlay.png",
+    "texture_height": 256,
+    "texture_width": 256
+  },
   "model": "occultism:dictionary_of_spirits_icon",
   "name": "book.occultism.dictionary_of_spirits.name",
-  "tooltip": "book.occultism.dictionary_of_spirits.tooltip"
+  "read_all_button_y_offset": 0,
+  "right_frame_overlay": {
+    "frame_height": 70,
+    "frame_width": 8,
+    "frame_x_offset": -4,
+    "frame_y_offset": 0,
+    "texture": "modonomicon:textures/gui/book_frame_right_overlay.png",
+    "texture_height": 256,
+    "texture_width": 256
+  },
+  "search_button_x_offset": 0,
+  "search_button_y_offset": 0,
+  "tooltip": "book.occultism.dictionary_of_spirits.tooltip",
+  "top_frame_overlay": {
+    "frame_height": 7,
+    "frame_width": 72,
+    "frame_x_offset": 0,
+    "frame_y_offset": 4,
+    "texture": "modonomicon:textures/gui/book_frame_top_overlay.png",
+    "texture_height": 256,
+    "texture_width": 256
+  }
 }

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/crafting_rituals.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
   "icon": "occultism:textures/gui/book/infusion.png",
   "name": "book.occultism.dictionary_of_spirits.crafting_rituals.name",

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/familiar_rituals.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
   "icon": "occultism:textures/gui/book/parrot.png",
   "name": "book.occultism.dictionary_of_spirits.familiar_rituals.name",

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/getting_started.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
   "icon": "occultism:dictionary_of_spirits_icon",
   "name": "book.occultism.dictionary_of_spirits.getting_started.name",

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/pentacles.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "condition": {
     "type": "modonomicon:entry_read",
     "entry_id": "occultism:getting_started/intro"

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/possession_rituals.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
   "icon": "occultism:textures/gui/book/possession.png",
   "name": "book.occultism.dictionary_of_spirits.possession_rituals.name",

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/rituals.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "condition": {
     "type": "modonomicon:entry_read",
     "entry_id": "occultism:getting_started/intro"

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/spirits.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
   "icon": "occultism:textures/gui/book/spirits.png",
   "name": "book.occultism.dictionary_of_spirits.spirits.name",

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/storage.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "condition": {
     "type": "modonomicon:entry_read",
     "entry_id": "occultism:getting_started/intro"

src/generated/resources/data/occultism/modonomicon/books/dictionary_of_spirits/categories/summoning_rituals.json

@@ -1,5 +1,8 @@
 {
   "background": "modonomicon:textures/gui/dark_slate_seamless.png",
+  "background_height": 512,
+  "background_parallax_layers": [],
+  "background_width": 512,
   "entry_textures": "modonomicon:textures/gui/entry_textures.png",
   "icon": "occultism:textures/gui/book/summoning.png",
   "name": "book.occultism.dictionary_of_spirits.summoning_rituals.name",

src/main/java/com/github/klikli_dev/occultism/Occultism.java

@@ -111,7 +111,6 @@ public Occultism() {
         GeckoLib.initialize();
     }
 
-
     private void commonSetup(final FMLCommonSetupEvent event) {
         OccultismPackets.registerMessages();