From 1600bdac6fb6ed14f0c1327f3ee5b0e86f6c96d9 Mon Sep 17 00:00:00 2001 From: Jakub Date: Wed, 2 Oct 2024 18:00:42 +0200 Subject: [PATCH 1/5] [ci skip] fork --- README.md | 10 +++++----- gradle.properties | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 64ee77a..b28d36a 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 7439bd4..d6a5444 100644 --- a/gradle.properties +++ b/gradle.properties @@ -134,7 +134,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/ @@ -143,7 +143,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;... @@ -152,13 +152,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: GTNH Mixins 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;... @@ -166,7 +166,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. From 5376e0b230c001b68dcd04e0b12e0203469d5f3b Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Sun, 12 Oct 2025 20:14:28 +0300 Subject: [PATCH 2/5] Set Handler Custom Scroll (#10) --- src/main/java/com/kuba6000/mobsinfo/nei/IMCForNEI.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/kuba6000/mobsinfo/nei/IMCForNEI.java b/src/main/java/com/kuba6000/mobsinfo/nei/IMCForNEI.java index f829d69..4ee4970 100644 --- a/src/main/java/com/kuba6000/mobsinfo/nei/IMCForNEI.java +++ b/src/main/java/com/kuba6000/mobsinfo/nei/IMCForNEI.java @@ -35,13 +35,13 @@ public class IMCForNEI { public static void IMCSender() { - sendHandler("mobsinfo.mobhandler", "minecraft:diamond_sword", 168, 105, 1, 6); + sendHandler("mobsinfo.mobhandler", "minecraft:diamond_sword", 168, 332, 1, 6); sendCatalyst("mobsinfo.mobhandler", "minecraft:diamond_sword"); if (LoaderReference.InfernalMobs.isLoaded) { - sendHandler("mobsinfo.mobhandlerinfernal", "minecraft:diamond_sword", 168, 105, 1, 6); + sendHandler("mobsinfo.mobhandlerinfernal", "minecraft:diamond_sword", 168, 332, 1, 6); sendCatalyst("mobsinfo.mobhandlerinfernal", "minecraft:diamond_sword"); } - sendHandler("mobsinfo.villagertradeshandler", "minecraft:emerald", 168, 105, 1, 6); + sendHandler("mobsinfo.villagertradeshandler", "minecraft:emerald", 168, 332, 1, 6); sendCatalyst("mobsinfo.villagertradeshandler", "minecraft:emerald"); sendCatalyst("mobsinfo.villagertradeshandler", "minecraft:spawn_egg:120"); @@ -55,6 +55,7 @@ private static void sendHandler(String aName, String aBlock, int width, int heig aNBT.setString("modName", MODNAME); aNBT.setString("modId", MODID); aNBT.setBoolean("modRequired", true); + aNBT.setBoolean("useCustomScroll", true); aNBT.setString("itemName", aBlock); aNBT.setInteger("handlerHeight", height); aNBT.setInteger("handlerWidth", width); From e59d8ffb0d1f933401e0ed3890998220219b3de7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 12 Oct 2025 19:17:04 +0200 Subject: [PATCH 3/5] update --- dependencies.gradle | 36 ++++++++++++++++++------------------ settings.gradle | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8a42c89..d88bb10 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,31 +35,31 @@ */ dependencies { - api("com.github.GTNewHorizons:NotEnoughItems:2.7.69-GTNH:dev") - devOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.9.22:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.8.11-GTNH:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.10.0:dev") devOnlyNonPublishable(rfg.deobf("curse.maven:Infernal-Mobs-227875:2227584")) - compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.2-GTNH:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Draconic-Evolution:1.4.24-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.46-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.7.6:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Draconic-Evolution:1.5.2-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.14.4-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.8.0:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.7:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.12.13-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Botania:1.12.21-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.13.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Botania:1.13.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:harvestcraft:1.3.2-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:OpenBlocks:1.11.7-GTNH:dev") { transitive = false } - compileOnly('com.github.GTNewHorizons:OpenModsLib:0.10.10:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenModsLib:0.11.0:dev') { transitive = false } compileOnly("com.github.GTNewHorizons:BloodArsenal:1.4.10:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.48:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicTinkerer:2.11.20:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForbiddenMagic:0.8.1-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Electro-Magic-Tools:1.6.11:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:WitchingGadgets:1.7.16-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.418:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.12.13-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.16:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:ThaumicBases:1.8.11:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:BloodMagic:1.8.3:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicTinkerer:2.12.2:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForbiddenMagic:0.9.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Electro-Magic-Tools:1.6.17:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:WitchingGadgets:1.7.24-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.32:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.13.0-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.17:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:ThaumicBases:1.9.0:dev") { transitive = false } compileOnly(rfg.deobf("curse.maven:witchery-69673:2234410")) compileOnly(rfg.deobf("curse.maven:Automagy-222153:2285272")) compileOnly(rfg.deobf("curse.maven:edit-mob-drops-348932:4458014")) diff --git a/settings.gradle b/settings.gradle index 7622cde..9f80246 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.41' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43' } From 08f44ae80a58ad1430c79157c17400e5cec6b683 Mon Sep 17 00:00:00 2001 From: Jakub Date: Sun, 12 Oct 2025 19:45:15 +0200 Subject: [PATCH 4/5] Update release-tags.yml --- .github/workflows/release-tags.yml | 87 +++--------------------------- 1 file changed, 6 insertions(+), 81 deletions(-) diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml index 280d953..e4c0be6 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,81 +5,10 @@ on: push: tags: [ '*' ] -jobs: - build: - runs-on: ubuntu-latest - env: - VERSION: ${{ github.ref_name }} - RELEASE_VERSION: ${{ github.ref_name }} - SNAPSHOT: ${{ endsWith(github.ref_name, '-snapshot') || contains(github.event.head_commit.message, '[snapshot]') }} - MAVEN_PUBLISHING_URL: ${{ vars.MAVEN_PUBLISHING_URL || 'https://nexus.gtnewhorizons.com/repository/releases/' }} - steps: - - name: Checkout mod repo - uses: actions/checkout@v4 - with: - fetch-depth: 32 - - - name: Validate gradle wrapper checksum - uses: gradle/wrapper-validation-action@v2 - - - name: Set up JDK versions - uses: actions/setup-java@v4 - with: - java-version: | - 8 - 21 - 17 - distribution: 'zulu' - cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - - name: Setup the workspace - run: ./gradlew --build-cache --info --stacktrace -PmavenPublishUrl='${{ env.MAVEN_PUBLISHING_URL }}' setupCIWorkspace +permissions: + contents: write - - name: Build the mod - run: ./gradlew --build-cache --info --stacktrace -PmavenPublishUrl='${{ env.MAVEN_PUBLISHING_URL }}' assemble - - # Continue on error in the following steps to make sure releases still get made even if one of the methods fails - - - name: Delete old release if it already exists - run: gh release delete --yes "${RELEASE_VERSION}" - continue-on-error: true - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Release under current tag - run: | - PRERELEASE="" - if [[ "$SNAPSHOT" == "true" ]]; then - PRERELEASE="--prerelease" - fi - export "CHANGELOG_FILE=$(mktemp --suffix=.md)" - echo "CHANGELOG_FILE=${CHANGELOG_FILE}" >> $GITHUB_ENV - gh api --method POST -H "Accept: application/vnd.github+json" \ - "/repos/${GITHUB_REPOSITORY}/releases/generate-notes" \ - -f tag_name="${RELEASE_VERSION}" \ - --jq ".body" > "${CHANGELOG_FILE}" - cat "${CHANGELOG_FILE}" - gh release create "${RELEASE_VERSION}" -F "${CHANGELOG_FILE}" $PRERELEASE ./build/libs/*.jar - shell: bash - continue-on-error: true - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Publish to Maven - run: ./gradlew --build-cache --info --stacktrace -PmavenPublishUrl='${{ env.MAVEN_PUBLISHING_URL }}' assemble publish -x test - continue-on-error: true - env: - MAVEN_USER: ${{ secrets.MAVEN_USER }} - MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }} - if: ${{ env.MAVEN_USER != '' }} - - - name: Publish to Modrinth and CurseForge - run: ./gradlew --build-cache --info --stacktrace -PmavenPublishUrl='${{ env.MAVEN_PUBLISHING_URL }}' assemble publish -x test - continue-on-error: true - env: - MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} - CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }} - if: ${{ env.SNAPSHOT != 'true' }} \ No newline at end of file +jobs: + release-tags: + uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master + secrets: inherit From 7ac344b55831a1956bc0b8c9d5e12decb64656b5 Mon Sep 17 00:00:00 2001 From: slprime Date: Fri, 16 Jan 2026 21:28:35 +0200 Subject: [PATCH 5/5] Correctly detect active stack for tooltip --- src/main/java/com/kuba6000/mobsinfo/nei/MobHandler.java | 9 +++++++-- .../com/kuba6000/mobsinfo/nei/MobHandlerInfernal.java | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) 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);