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

Allow items to be unlocked in recipe menu #3628

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Allow items to be unlocked in recipe menu #3628

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7147858
Unlock researches in recipe view
RobotHanzo Oct 2, 2021
1cf2173
Merge requested changes
RobotHanzo Oct 3, 2021
48c2afb
The right way
RobotHanzo Oct 3, 2021
2f70fe0
Merge pull request #3296 from RobotHanzo/feature/unlock-research-in-r…
TheBusyBiscuit Jul 25, 2022
51a2e19
Some additional cleanup
TheBusyBiscuit Jul 25, 2022
2de0f83
Unlocking now uses the proper method and no longer causes an exception.
TheBusyBiscuit Aug 8, 2022
8152b6b
Merge branch 'master' into feature/unlock-items-in-recipe-menu
WalshyDev Jul 3, 2023
2b0eb14
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…
Sfiguz7 Jul 3, 2023
6e8094f
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…
WalshyDev Jul 3, 2023
1ca9567
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…
WalshyDev Jul 4, 2023
e572df0
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementatio…
J3fftw1 Jul 29, 2023
5697404
Merge branch 'master' into feature/unlock-items-in-recipe-menu
J3fftw1 Dec 5, 2023
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 ...n/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlock;
import io.github.thebusybiscuit.slimefun4.core.multiblocks.MultiBlockMachine;
import io.github.thebusybiscuit.slimefun4.core.services.localization.SlimefunLocalization;
import io.github.thebusybiscuit.slimefun4.core.services.sounds.SoundEffect;
import io.github.thebusybiscuit.slimefun4.implementation.Slimefun;
import io.github.thebusybiscuit.slimefun4.implementation.tasks.AsyncRecipeChoiceTask;
import io.github.thebusybiscuit.slimefun4.utils.ChatUtils;
Expand Down Expand Up @@ -305,9 +306,9 @@ private void displaySlimefunItem(ChestMenu menu, ItemGroup itemGroup, Player p,
Slimefun.getLocalization().sendMessage(pl, "guide.cheat.no-multiblocks");
} else {
ItemStack clonedItem = sfitem.getItem().clone();

nt(clonedItem.ge
Sfiguz7 marked this conversation as resolved.
Show resolved Hide resolved
if (action.isShiftClicked()) {
clonedItem.setAmount(clonedItem.getMaxStackSize());
clonedItem.setAmoutMaxStackSize());
WalshyDev marked this conversation as resolved.
Show resolved Hide resolved
}

pl.getInventory().addItem(clonedItem);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.