Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# 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

on:
push:
tags: [ '*' ]

permissions:
contents: write

jobs:
build:
runs-on: ubuntu-24.04
Expand Down Expand Up @@ -105,4 +104,4 @@ jobs:
continue-on-error: true
env:
CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
if: ${{ env.SNAPSHOT != 'true' && env.PRERELEASE != 'true' }}
if: ${{ env.SNAPSHOT != 'true' && env.PRERELEASE != 'true' }}
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div align=center>

# 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).

</div>

Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand All @@ -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;...
Expand All @@ -154,21 +154,21 @@ 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;...
# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
# 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.
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/com/kuba6000/mobsinfo/nei/MobHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -689,12 +690,16 @@ && new Rectangle(biomeTooltipX, biomeTooltipY, biomeTooltipWidth, biomeTooltipHe
@Override
public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ public void drawForeground(int recipeID) {
@Override
public List<String> handleItemTooltip(GuiRecipe<?> gui, ItemStack stack, List<String> 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);
Expand Down