1.19 API Update (#317)

* Update stale.yml (#302)

* update build.gradle and bug-report.yml (#306)

* add api output to jarjar (#308)

* add entity size attribute and shrink effect (#310)

* additional shrink effect stuff

* fix eye height for entities with hardcoded eye height

* Bump to v1.18.2-1.1.1 (#311)

* bump version in bug report template

* add shrink update info to the changelog

* Fix build process (#312)

* Fix build.gradle

* Fix release.yml

* Update changelog.md

* add altar power to TOP info (#314)

* Fix fall damage (#315)

* bump version number, update changelog and run datagen

* fix release workflow (#316)

* move a bunch of stuff to datapack registries

* move a bunch of stuff to datapack registries (part 2)

* add liquid essence fluid

* implement hud config

* add hud manager open translation

* fix stats and disable ice guardian test

* move even more stuff to dynamic registries

* make liquid essence stop fall damage (liquid essence is subject to MinecraftForge/MinecraftForge#8897 and thus still a bit broken)

* some tweaks and fixes

* address comments by @IchHabeHunger54

* update to 1.19.2, move worldgen to datapack, fix recipes

* apply suggested refactors

* fix mixin config

* hotfix for #318 (#320)

* pin FG version because of bug in JiJ

* update changelog and release workflow

* update changelog

* move inscription table and occulus blockstates to datagen

* Prevent crash due to #321 (#322)

* dedupe goals and remove unnecessary AT

* add local.properties

* add github helper for using dependencies from github packages

* add safety for when mods f*** with attributes or use the wrong event to register them

* bump version and changelog

* merge ability and affinity packages

Co-authored-by: IchHabeHunger54 <[email protected]>

.editorconfig

@@ -111,8 +111,8 @@ ij_java_for_brace_force = always
 ij_java_for_statement_new_line_after_left_paren = false
 ij_java_for_statement_right_paren_on_new_line = false
 ij_java_for_statement_wrap = off
-ij_java_generate_final_locals = true
-ij_java_generate_final_parameters = true
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
 ij_java_if_brace_force = always
 ij_java_imports_layout = *,|,javax.**,java.**,|,$*
 ij_java_indent_case_from_switch = true

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -52,7 +52,9 @@ body:
         - 1.18.2-1.1.0
         - 1.18.2-1.1.1
         - 1.18.2-1.1.2
-        - 1.19-1.1.2
+        - 1.18.2-1.1.3
+        - 1.18.2-1.1.4
+        - 1.19.2-1.1.4
     validations:
       required: true
   - type: input

.github/workflows/release.yml

@@ -49,6 +49,7 @@ jobs:
             build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-sources.jar
             build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-javadoc.jar
             build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-deobf.jar
+            build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-all.jar
           body: >
              ${{ steps.changelog.outputs.content }}
       - name: CF upload
@@ -60,7 +61,7 @@ jobs:
           token: ${{ secrets.CF_API_TOKEN }}
           project_id: ${{ steps.build.outputs.project_id }}
           game_versions: ${{ steps.build.outputs.curse_versions }}
-          file_path: build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}.jar
+          file_path: build/libs/${{ steps.build.outputs.modid }}-${{ steps.build.outputs.version }}-all.jar
           relations: ${{ steps.build.outputs.curse_relations }}
           changelog_type: markdown
           changelog: >

.gitignore

@@ -116,3 +116,4 @@ run/
 /src/generated/resources/.cache/
 !run/client/options.txt
 !run/server/eula.txt
+/local.properties

build.gradle

@@ -24,6 +24,15 @@ plugins {
 
 //=============================================
 
+if (project.rootProject.file("local.properties").exists()) {
+    try (def stream = project.rootProject.file("local.properties").newDataInputStream()) {
+        def properties = new Properties()
+        properties.load(stream)
+        properties.forEach { key, value ->
+            project.ext.set(key, value)
+        }
+    }
+}
 
 mixin {
     add sourceSets.main, "${project.mod_id}.refmap.json"
@@ -71,7 +80,7 @@ sourceSets {
         srcDirs += 'src/main/generated'
         exclude '.cache'
     }
-    data.resources.srcDirs = []
+    data {}
 }
 
 configurations {
@@ -113,6 +122,19 @@ configurations {
     dataImplementation.extendsFrom(datagenLibrary)
 }
 
+def github(RepositoryHandler rep, String ownerRepo) {
+    if (project.hasProperty('github_packages_user') && project.hasProperty('github_packages_token')) {
+        rep.maven {
+            name = "${ownerRepo}"
+            url = "https://maven.pkg.github.com/${ownerRepo}"
+            credentials {
+                username = "${project.github_packages_user}"
+                password = "${project.github_packages_token}"
+            }
+        }
+    }
+}
+
 repositories {
     mavenLocal()
     mavenCentral()
@@ -185,8 +207,8 @@ dependencies {
     annotationProcessor group: 'org.spongepowered', name: 'mixin', version: project.mixin_version, classifier: 'processor'
 
     // jei for integration
-    modAPI fg.deobf("mezz.jei:jei-${project.mc_version}-common-api:${project.jei_version}")
-    //runtimeMod fg.deobf("mezz.jei:jei-${project.mc_version}-forge:${project.jei_version}")
+    modAPI fg.deobf("mezz.jei:jei-1.19.1-common-api:${project.jei_version}")
+    runtimeMod fg.deobf("mezz.jei:jei-1.19.1-forge:${project.jei_version}")
 
     // curios for additional inventory slots
     modAPI fg.deobf("top.theillusivec4.curios:curios-forge:${project.curios_version}:api")
@@ -201,8 +223,11 @@ dependencies {
     runtimeMod fg.deobf("mcjty.theoneprobe:theoneprobe:${project.top_version}") { transitive = false }
 
     if (!System.getenv('GITHUB_ACTIONS')) {
+        if (project.hasProperty('github_packages_user') && project.hasProperty('github_packages_token')) {
+            println 'Using github packages'
+        }
         runtimeMod fg.deobf("com.github.minecraftschurlimods:potionbundles:${project.potionbundles_version}")
-        runtimeMod fg.deobf("com.blamejared.controlling:Controlling-forge-${project.mc_version}:${project.controlling_version}")
+        runtimeMod fg.deobf("com.blamejared.controlling:Controlling-forge-1.19.1:${project.controlling_version}")
     }
 
     // add internal libraries
@@ -215,6 +240,9 @@ dependencies {
     include fg.deobf('com.github.minecraftschurlimods:betterkeybindlib:1.19-1.1-SNAPSHOT') {
         jarJar.ranged(it, '[1.19-1.1-SNAPSHOT,)')
     }
+    include fg.deobf('com.github.minecraftschurlimods:betterhudlib:1.19-1.0-SNAPSHOT') {
+        jarJar.ranged(it, '[1.19-1.0-SNAPSHOT,)')
+    }
     datagenLibrary fg.deobf('com.github.minecraftschurlimods:patchouli_datagen-forge-1.19:1.0-SNAPSHOT')
 
     implementation sourceSets.api.output
@@ -254,7 +282,7 @@ minecraft {
         data {
             ideaModule "${project.name.replace(' ', '_')}.data"
             singleInstance true
-            args '--mod', project.mod_id, '--all', '--output', file('src/main/generated/'), '--existing', file('src/main/resources/')
+            args '--mod', project.mod_id, '--all', '--output', file('src/main/generated/'), '--existing', file('src/main/resources/'), '--mixin.config', "${project.mod_id}_data.mixins.json"
             mods.create("${project.mod_id}") {
                 source sourceSets.api as SourceSet
                 source sourceSets.main as SourceSet

changelog.md

@@ -1,5 +1,7 @@
-# Version 1.19-1.1.2
+# Version 1.19.2-1.1.4
 
 ## Changes
 
-- Update to 1.19
+- Update to 1.19.2
+- Moved some Datapack stuff
+- Added HUD management

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 mod_group=com.github.minecraftschurlimods
 mod_id=arsmagicalegacy
 mod_name=Ars Magica: Legacy
-mod_version=1.1.2
+mod_version=1.1.4
 mod_author=Minecraftschurli, IchHabeHunger54
 mod_credits=Mithion for the original mod
 mod_url=https://www.curseforge.com/minecraft/mc-mods/ars-magica-legacy
@@ -18,25 +18,25 @@ java_version=17
 mixin_version=0.8.5
 
 mappings_channel=parchment
-mappings_version=1.18.2-2022.06.05-1.19
+mappings_version=1.18.2-2022.06.05-1.19.2
 
-mc_version=1.19
-forge_version=41.0.99
+mc_version=1.19.2
+forge_version=43.0.7
 
-loader_version_range=[41,)
-forge_version_range=[41.0.99,)
-mc_version_range=[1.19,1.20)
+loader_version_range=[43,)
+forge_version_range=[43.0.7,)
+mc_version_range=[1.19.2,1.20)
 patchouli_version_range=[1.19-75,1.20)
-curios_version_range=[1.19,1.20)
+curios_version_range=[1.19.2,1.20)
 jei_version_range=[11,)
 
-jei_version=11.0.0.206
+jei_version=11.2.0.244
 top_version=1.19-6.2.0-6
-curios_version=1.19-5.1.0.4
+curios_version=1.19.2-5.1.1.0
 patchouli_version=1.19-76-SNAPSHOT
 potionbundles_version=1.19-1.4-SNAPSHOT
-controlling_version=10.0+3
+controlling_version=10.0+4
 
 curse_project_id=350734
-curse_versions=Java 17,Forge,Minecraft 1.19:1.19
+curse_versions=Java 17,Forge,Minecraft 1.19:1.19.2
 curse_relations=configured:optionalDependency,catalogue:optionalDependency,potion-bundles:optionalDependency,jei:optionalDependency,curios:optionalDependency,patchouli:requiredDependency,the-one-probe:optionalDependency

run/client/options.txt

@@ -111,11 +111,41 @@ key_key.hotbar.6:key.keyboard.6
 key_key.hotbar.7:key.keyboard.7
 key_key.hotbar.8:key.keyboard.8
 key_key.hotbar.9:key.keyboard.9
-key_key.toggleLiquids:key.keyboard.unknown
 key_key.toggleVisible:key.keyboard.unknown
+key_key.toggleLiquids:key.keyboard.unknown
 key_key.curios.open.desc:key.keyboard.g
+key_hud_manager.open:key.keyboard.m:ALT
 key_key.arsmagicalegacy.next_shape_group:key.keyboard.c:SHIFT
 key_key.arsmagicalegacy.configure_spell:key.keyboard.m:CONTROL
+key_key.jei.previousSearch:key.keyboard.up
+key_key.jei.previousPage:key.keyboard.unknown
+key_key.jei.nextSearch:key.keyboard.down
+key_key.jei.toggleHideIngredient:key.mouse.left:CONTROL
+key_key.jei.showUses:key.keyboard.u
+key_key.jei.toggleBookmarkOverlay:key.keyboard.unknown
+key_key.jei.bookmark:key.keyboard.a
+key_key.jei.toggleCheatMode:key.keyboard.unknown
+key_key.jei.cheatOneItem:key.mouse.left
+key_key.jei.showRecipe2:key.mouse.left
+key_key.jei.previousRecipePage:key.keyboard.page.up
+key_key.jei.nextCategory:key.keyboard.page.down:SHIFT
+key_key.jei.cheatItemStack2:key.mouse.middle
+key_key.jei.toggleEditMode:key.keyboard.unknown
+key_key.jei.toggleCheatModeConfigButton:key.mouse.left:CONTROL
+key_key.jei.toggleWildcardHideIngredient:key.mouse.right:CONTROL
+key_key.jei.nextPage:key.keyboard.unknown
+key_key.jei.cheatItemStack:key.mouse.left:SHIFT
+key_key.jei.closeRecipeGui:key.keyboard.escape
+key_key.jei.toggleOverlay:key.keyboard.o:CONTROL
+key_key.jei.recipeBack:key.keyboard.backspace
+key_key.jei.showRecipe:key.keyboard.r
+key_key.jei.nextRecipePage:key.keyboard.page.down
+key_key.jei.clearSearchBar:key.mouse.right
+key_key.jei.previousCategory:key.keyboard.page.up:SHIFT
+key_key.jei.copy.recipe.id:key.keyboard.unknown
+key_key.jei.cheatOneItem2:key.mouse.right
+key_key.jei.focusSearch:key.keyboard.f:CONTROL
+key_key.jei.showUses2:key.mouse.right
 soundCategory_master:0.01986755
 soundCategory_music:0.0
 soundCategory_record:1.0

settings.gradle

@@ -1,7 +1,7 @@
 pluginManagement {
     plugins {
         id 'org.ec4j.editorconfig' version '0.0.3'
-        id 'net.minecraftforge.gradle' version '5.1.+'
+        id 'net.minecraftforge.gradle' version '5.1.53'
         id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
         id 'org.parchmentmc.librarian.forgegradle' version '1.2+'
     }

src/api/java/com/github/minecraftschurlimods/arsmagicalegacy/api/ArsMagicaAPI.java

@@ -1,8 +1,6 @@
 package com.github.minecraftschurlimods.arsmagicalegacy.api;
 
-import com.github.minecraftschurlimods.arsmagicalegacy.api.ability.IAbility;
-import com.github.minecraftschurlimods.arsmagicalegacy.api.ability.IAbilityManager;
-import com.github.minecraftschurlimods.arsmagicalegacy.api.affinity.IAffinity;
+import com.github.minecraftschurlimods.arsmagicalegacy.api.affinity.Affinity;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.affinity.IAffinityHelper;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.etherium.IEtheriumHelper;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.magic.ContingencyType;
@@ -11,17 +9,19 @@
 import com.github.minecraftschurlimods.arsmagicalegacy.api.magic.IMagicHelper;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.magic.IManaHelper;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.magic.IRiftHelper;
-import com.github.minecraftschurlimods.arsmagicalegacy.api.occulus.IOcculusTabManager;
+import com.github.minecraftschurlimods.arsmagicalegacy.api.ritual.RitualEffect;
+import com.github.minecraftschurlimods.arsmagicalegacy.api.ritual.RitualRequirement;
+import com.github.minecraftschurlimods.arsmagicalegacy.api.ritual.RitualTrigger;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.ISkillHelper;
-import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.ISkillManager;
-import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.ISkillPoint;
+import com.github.minecraftschurlimods.arsmagicalegacy.api.skill.SkillPoint;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpell;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellDataManager;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellHelper;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellPart;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ISpellTransformationManager;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.ShapeGroup;
 import com.github.minecraftschurlimods.arsmagicalegacy.api.spell.SpellStack;
+import com.mojang.serialization.Codec;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.CreativeModeTab;
@@ -32,6 +32,7 @@
 import net.minecraftforge.fml.loading.FMLLoader;
 import net.minecraftforge.registries.IForgeRegistry;
 import org.apache.logging.log4j.LogManager;
+import org.jetbrains.annotations.ApiStatus.Experimental;
 import org.jetbrains.annotations.ApiStatus.NonExtendable;
 import org.jetbrains.annotations.Unmodifiable;
 
@@ -78,48 +79,37 @@ static ArsMagicaAPI get() {
     /**
      * @return The registry for skill points.
      */
-    IForgeRegistry<ISkillPoint> getSkillPointRegistry();
+    IForgeRegistry<SkillPoint> getSkillPointRegistry();
 
     /**
      * @return The registry for affinities.
      */
-    IForgeRegistry<IAffinity> getAffinityRegistry();
+    IForgeRegistry<Affinity> getAffinityRegistry();
 
     /**
      * @return The registry for spell parts.
      */
     IForgeRegistry<ISpellPart> getSpellPartRegistry();
 
-    /**
-     * @return The registry for abilities.
-     */
-    IForgeRegistry<IAbility> getAbilityRegistry();
-
     /**
      * @return The registry for contingency types.
      */
     IForgeRegistry<ContingencyType> getContingencyTypeRegistry();
 
-    /**
-     * @return The skill manager instance.
-     */
-    ISkillManager getSkillManager();
+    @Experimental
+    IForgeRegistry<Codec<? extends RitualTrigger>> getRitualTriggerTypeRegistry();
 
-    /**
-     * @return The occulus tab manager instance.
-     */
-    IOcculusTabManager getOcculusTabManager();
+    @Experimental
+    IForgeRegistry<Codec<? extends RitualRequirement>> getRitualRequirementTypeRegistry();
+
+    @Experimental
+    IForgeRegistry<Codec<? extends RitualEffect>> getRitualEffectTypeRegistry();
 
     /**
      * @return The spell data manager instance.
      */
     ISpellDataManager getSpellDataManager();
 
-    /**
-     * @return The ability manager instance.
-     */
-    IAbilityManager getAbilityManager();
-
     /**
      * @return The spell data manager instance.
      */