diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index b7f73f8..495913f 100644 --- a/.github/workflows/release-tags.yml +++ b/.github/workflows/release-tags.yml @@ -1,7 +1,3 @@ -# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle - -# copied from https://github.com/GTNewHorizons/GTNH-Actions-Workflows/blob/master/.github/workflows/release-tags.yml name: Release tagged build @@ -9,6 +5,9 @@ on: push: tags: [ '*' ] +permissions: + contents: write + jobs: build: runs-on: ubuntu-24.04 @@ -105,4 +104,4 @@ jobs: continue-on-error: true env: CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - if: ${{ env.SNAPSHOT != 'true' && env.PRERELEASE != 'true' }} \ No newline at end of file + if: ${{ env.SNAPSHOT != 'true' && env.PRERELEASE != 'true' }} diff --git a/README.md b/README.md index 807872a..480953f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@
- -# Mobs Info 1.7.10 - -[![CF Downloads](https://cf.way2muchnoise.eu/full_879914_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/mobs-info) [![Modrinth Downloads](https://img.shields.io/modrinth/dt/ifG4OZxi?logo=modrinth) -](https://modrinth.com/mod/mobsinfo) + +# Mobs Info 1.7.10 GTNH FORK + +### Please open any mod-related PRs [upstream](https://github.com/kuba6000/Mobs-Info). +### If you want to change something GTNH-specific please try to do it in the configs or [KubaTech](https://github.com/GTNewHorizons/GT5-Unofficial/blob/master/src/main/java/kubatech/loaders/MobHandlerLoader.java).
diff --git a/gradle.properties b/gradle.properties index 9152ed5..ed41d04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -136,7 +136,7 @@ excludeWellKnownRepositories = # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. -usesMavenPublishing = false +usesMavenPublishing = true # Maven repository to publish the mod to. # mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/ @@ -145,7 +145,7 @@ usesMavenPublishing = false # # The project's ID on Modrinth. Can be either the slug or the ID. # Leave this empty if you don't want to publish to Modrinth. -modrinthProjectId = ifG4OZxi +modrinthProjectId = # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth. # Syntax: scope1-type1:name1;scope2-type2:name2;... @@ -154,13 +154,13 @@ modrinthProjectId = ifG4OZxi # and the name is the Modrinth project or version slug/id of the other mod. # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech # Note: UniMixins is automatically set as a required dependency if usesMixins = true. -modrinthRelations = required-project\:notenoughitems-unofficial +modrinthRelations = # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens. # # The project's numeric ID on CurseForge. You can find this in the About Project box. # Leave this empty if you don't want to publish on CurseForge. -curseForgeProjectId = 879914 +curseForgeProjectId = # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. # Syntax: type1:name1;type2:name2;... @@ -168,7 +168,7 @@ curseForgeProjectId = 879914 # and the name is the CurseForge project slug of the other mod. # Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft # Note: UniMixins is automatically set as a required dependency if usesMixins = true. -curseForgeRelations = requiredDependency\:notenoughitems-gtnh +curseForgeRelations = # Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older # projects. New projects should not use this parameter. diff --git a/src/main/java/com/kuba6000/mobsinfo/nei/MobHandler.java b/src/main/java/com/kuba6000/mobsinfo/nei/MobHandler.java index 5cf3cb1..4f9452d 100644 --- a/src/main/java/com/kuba6000/mobsinfo/nei/MobHandler.java +++ b/src/main/java/com/kuba6000/mobsinfo/nei/MobHandler.java @@ -80,6 +80,7 @@ import com.kuba6000.mobsinfo.config.Config; import com.kuba6000.mobsinfo.mixin.early.minecraft.GuiContainerAccessor; import com.kuba6000.mobsinfo.mixin.late.InfernalMobs.InfernalMobsCoreAccessor; +import com.kuba6000.mobsinfo.nei.MobHandler.MobPositionedStack; import com.kuba6000.mobsinfo.nei.scrollable.IScrollableGUI; import com.kuba6000.mobsinfo.nei.scrollable.Scrollbar; import com.kuba6000.mobsinfo.savedata.PlayerData; @@ -689,12 +690,16 @@ && new Rectangle(biomeTooltipX, biomeTooltipY, biomeTooltipWidth, biomeTooltipHe @Override public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipe) { MobCachedRecipe currentrecipe = ((MobCachedRecipe) arecipes.get(recipe)); + PositionedStack positionedStack = currentrecipe.mOutputs.stream() - .filter(ps -> ps.item == stack) + .filter(ps -> ps.containsWithNBT(stack)) .findFirst() .orElse(null); - if (positionedStack instanceof MobPositionedStack) + + if (positionedStack instanceof MobPositionedStack) { currenttip.addAll(((MobPositionedStack) positionedStack).extraTooltip); + } + return currenttip; } diff --git a/src/main/java/com/kuba6000/mobsinfo/nei/MobHandlerInfernal.java b/src/main/java/com/kuba6000/mobsinfo/nei/MobHandlerInfernal.java index f36bc75..cf2fa47 100644 --- a/src/main/java/com/kuba6000/mobsinfo/nei/MobHandlerInfernal.java +++ b/src/main/java/com/kuba6000/mobsinfo/nei/MobHandlerInfernal.java @@ -246,7 +246,7 @@ public void drawForeground(int recipeID) { @Override public List handleItemTooltip(GuiRecipe gui, ItemStack stack, List currenttip, int recipeID) { InfernalPositionedStack pstack = (InfernalPositionedStack) recipe.all.stream() - .filter(f -> f.item == stack) + .filter(f -> f.containsWithNBT(stack)) .findFirst() .orElse(null); if (pstack != null) pstack.handleTooltip(currenttip);