Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactors shift tooltips on MetaBaseItem a bit #3333

Merged
merged 7 commits into from
Oct 17, 2024
Merged

Refactors shift tooltips on MetaBaseItem a bit #3333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9fe5a4e
Refactors shift tooltips on MetaBaseItem a bit
querns Oct 5, 2024
e85bde2
Merge branch 'master' into shift-tooltip-tweak
querns Oct 6, 2024
6644af2
Merge branch 'master' into shift-tooltip-tweak
Dream-Master Oct 6, 2024
2b1eaa1
Merge branch 'master' into shift-tooltip-tweak
Alexdoru Oct 8, 2024
c54d046
Merge branch 'master' into shift-tooltip-tweak
Dream-Master Oct 8, 2024
4e707de
Merge branch 'refs/heads/master' into shift-tooltip-tweak
querns Oct 16, 2024
a40d016
Merge remote-tracking branch 'origin/shift-tooltip-tweak' into shift-…
querns Oct 16, 2024
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
5 changes: 3 additions & 2 deletions src/main/java/gregtech/api/interfaces/IItemBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package gregtech.api.interfaces;

import java.util.List;
import java.util.Optional;

import net.minecraft.dispenser.IBlockSource;
import net.minecraft.entity.Entity;
Expand Down Expand Up @@ -61,8 +62,8 @@ boolean onItemUseFirst(E aItem, ItemStack aStack, EntityPlayer aPlayer, World aW

List<String> getAdditionalToolTips(E aItem, List<String> aList, ItemStack aStack);

default List<String> getAdditionalToolTipsWhileSneaking(E aItem, List<String> aList, ItemStack aStack) {
return aList;
default Optional<List<String>> getAdditionalToolTipsWhileSneaking(E aItem, List<String> aList, ItemStack aStack) {
return Optional.empty();
}

void onUpdate(E aItem, ItemStack aStack, World aWorld, Entity aPlayer, int aTimer, boolean aIsInHand);
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/gregtech/api/items/MetaBaseItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Predicate;

Expand Down Expand Up @@ -269,8 +270,14 @@ public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<St
ArrayList<IItemBehaviour<MetaBaseItem>> behaviours = mItemBehaviors.get((short) getDamage(aStack));
if (behaviours != null) {
for (IItemBehaviour<MetaBaseItem> behavior : behaviours) {
aList = !KeyboardUtil.isShiftKeyDown() ? behavior.getAdditionalToolTips(this, aList, aStack)
: behavior.getAdditionalToolTipsWhileSneaking(this, aList, aStack);
final Optional<List<String>> shiftTooltips = KeyboardUtil.isShiftKeyDown()
? behavior.getAdditionalToolTipsWhileSneaking(this, aList, aStack)
: Optional.empty();
if (shiftTooltips.isPresent()) {
aList = shiftTooltips.get();
} else {
aList = behavior.getAdditionalToolTips(this, aList, aStack);
}
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/gregtech/common/items/behaviors/BehaviourSprayColorInfinite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static net.minecraft.util.MovingObjectPosition.MovingObjectType.BLOCK;

import java.util.List;
import java.util.Optional;
import java.util.function.Consumer;

import net.minecraft.entity.player.EntityPlayer;
Expand Down Expand Up @@ -114,16 +115,19 @@ public List<String> getAdditionalToolTips(final MetaBaseItem aItem, final List<S
}

@Override
public List<String> getAdditionalToolTipsWhileSneaking(final MetaBaseItem aItem, final List<String> aList,
public Optional<List<String>> getAdditionalToolTipsWhileSneaking(final MetaBaseItem aItem, final List<String> aList,
final ItemStack aStack) {
aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.infinite"));
aList.add(mTooltipChain);
aList.add(" ");
aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.switch"));
aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.gui"));
aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.pick"));
aList.add(StatCollector.translateToLocal("gt.behaviour.paintspray.infinite.tooltip.lock"));
aList.add(" ");
aList.add(AuthorQuerns);
return aList;

return Optional.of(aList);
}
// endregion

Expand Down