feat: update to latest modonomicon & update datagen accordingly

klikli-dev · Apr 3, 2023 · 0d25af5 · 0d25af5
1 parent 87a4aa4
commit 0d25af5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 42 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ smartbrainlib_src_file_id=TODO
 almostunified_version=1.19.4-TODO
 
 modonomicon_mc_version=1.19.4
-modonomicon_version=1.30.0
+modonomicon_version=1.30.1
 
 theurgy_mc_version=1.19.4
 theurgy_version=1.3.0
diff --git a/src/main/java/com/github/klikli_dev/occultism/Occultism.java b/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();
 

diff --git a/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java b/src/main/java/com/github/klikli_dev/occultism/datagen/OccultismBookProvider.java
@@ -69,10 +69,7 @@ private BookModel makeDictionaryOfSpirits() {
 
         //https://tinyurl.com/occultism-graph
 
-        var demoBook = BookModel.create(
-                        this.modLoc("dictionary_of_spirits"),
-                        helper.bookName()
-                )
+        var demoBook = BookModel.create(this.modLoc("dictionary_of_spirits"), helper.bookName())
                 .withModel(this.modLoc("dictionary_of_spirits_icon"))
                 .withTooltip(helper.bookTooltip())
                 .withCategories(
@@ -216,10 +213,7 @@ private BookCategoryModel makeGettingStartedCategory(BookLangHelper helper) {
         var craftingRitualsEntry = this.makeCraftingRitualsEntry(helper, entryHelper, 'z');
         craftingRitualsEntry.withParent(BookEntryParentModel.builder().withEntryId(moreRitualsEntry.id).build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon(OccultismItems.DICTIONARY_OF_SPIRITS_ICON.getId().toString())
                 .withEntries(
                         introEntry.build(),
@@ -1504,10 +1498,7 @@ private BookCategoryModel makeSpiritsSubcategory(BookLangHelper helper) {
         var wildHunt = this.makeWildHuntEntry(helper, entryHelper, 'w');
         wildHunt.withParent(BookEntryParentModel.builder().withEntryId(unboundSpirits.id).build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("occultism:textures/gui/book/spirits.png")
                 .withShowCategoryButton(false)
                 .withEntries(
@@ -1808,10 +1799,7 @@ private BookCategoryModel makePentaclesCategory(BookLangHelper helper) {
         craftAfrit.withCondition(BookTrueConditionModel.builder().build());
         craftMarid.withCondition(BookTrueConditionModel.builder().build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon(OccultismItems.PENTACLE.getId().toString())
                 .withEntries(
                         overview.build(),
@@ -2512,10 +2500,7 @@ private BookCategoryModel makeRitualsCategory(BookLangHelper helper) {
         crafting.withCondition(BookTrueConditionModel.builder().build());
         familiars.withCondition(BookTrueConditionModel.builder().build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("occultism:textures/gui/book/robe.png")
                 .withEntries(
                         ritualOverview.build(),
@@ -2749,10 +2734,7 @@ private BookCategoryModel makeSummoningRitualsSubcategory(BookLangHelper helper)
         afritEssence.withCondition(BookTrueConditionModel.builder().build());
         witherSkull.withCondition(BookTrueConditionModel.builder().build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("occultism:textures/gui/book/summoning.png")
                 .withShowCategoryButton(false)
                 .withEntries(
@@ -3579,10 +3561,7 @@ private BookCategoryModel makeCraftingRitualsSubcategory(BookLangHelper helper)
         craftSoulGem.withCondition(BookTrueConditionModel.builder().build());
         craftFamiliarRing.withCondition(BookTrueConditionModel.builder().build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("occultism:textures/gui/book/infusion.png")
                 .withShowCategoryButton(false)
                 .withEntries(
@@ -4220,10 +4199,7 @@ private BookCategoryModel makePossessionRitualsSubcategory(BookLangHelper helper
         possessWitherSkeleton.withCondition(BookTrueConditionModel.builder().build());
         afritEssence.withCondition(BookTrueConditionModel.builder().build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("occultism:textures/gui/book/possession.png")
                 .withShowCategoryButton(false)
                 .withEntries(
@@ -4471,10 +4447,7 @@ private BookCategoryModel makeFamiliarRitualsSubcategory(BookLangHelper helper)
         familiarParrot.withCondition(BookTrueConditionModel.builder().build());
         familiarShubNiggurath.withCondition(BookTrueConditionModel.builder().build());
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("occultism:textures/gui/book/parrot.png")
                 .withShowCategoryButton(false)
                 .withEntries(
@@ -5193,10 +5166,7 @@ private BookCategoryModel makeStorageCategory(BookLangHelper helper) {
 
         helper.category("storage");
 
-        return BookCategoryModel.create(
-                        this.modLoc(helper.category),
-                        helper.categoryName()
-                )
+        return BookCategoryModel.create(this.modLoc(helper.category), helper.categoryName())
                 .withIcon("minecraft:chest")
                 .withEntries(
                         overview.build(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -111,7 +111,6 @@ public Occultism() { @@
             GeckoLib.initialize();
         }
         private void commonSetup(final FMLCommonSetupEvent event) {
             OccultismPackets.registerMessages();
@@ Expand Down @@