Skip to content

[pull] 1.19.4 from cabaletta:1.19.4 #18

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

Merged
pull merged 4 commits into from
Jul 20, 2026
+14 −8
Merged

[pull] 1.19.4 from cabaletta:1.19.4 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f73685
Fix Litematica detection
ZacSharp Jun 14, 2026
8a70635
Only move pickaxe/throwaway to hotbar when active
ZacSharp Jul 5, 2026
3574b0c
Merge pull request #5068 from ZacSharp/pr/1.19.4/schematics/litematic…
leijurv Jul 20, 2026
cc2a2a5
Merge pull request #5069 from ZacSharp/pr/1.19.4/inventory/onlyWhenAc…
leijurv Jul 20, 2026
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
14 changes: 8 additions & 6 deletions src/main/java/baritone/behavior/InventoryBehavior.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,14 @@ public void onTick(TickEvent event) {
return;
}
ticksSinceLastInventoryMove++;
if (firstValidThrowaway() >= 9) { // aka there are none on the hotbar, but there are some in main inventory
requestSwapWithHotBar(firstValidThrowaway(), 8);
}
int pick = bestToolAgainst(Blocks.STONE, PickaxeItem.class);
if (pick >= 9) {
requestSwapWithHotBar(pick, 0);
if (baritone.getPathingBehavior().isPathing()) {
if (firstValidThrowaway() >= 9) { // aka there are none on the hotbar, but there are some in main inventory
requestSwapWithHotBar(firstValidThrowaway(), 8);
}
int pick = bestToolAgainst(Blocks.STONE, PickaxeItem.class);
if (pick >= 9) {
requestSwapWithHotBar(pick, 0);
}
}
if (lastTickRequestedMove != null) {
logDebug("Remembering to move " + lastTickRequestedMove[0] + " " + lastTickRequestedMove[1] + " from a previous tick");
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import fi.dy.masa.litematica.schematic.placement.SchematicPlacement;
import fi.dy.masa.litematica.schematic.placement.SubRegionPlacement;
import fi.dy.masa.litematica.world.SchematicWorldHandler;
import fi.dy.masa.litematica.world.WorldSchematic;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Vec3i;
import net.minecraft.util.Tuple;
Expand All @@ -37,6 +36,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Supplier;

/**
* Helper class that provides access or processes data related to Litmatica schematics.
Expand Down Expand Up @@ -99,7 +99,11 @@ public static Tuple<IStaticSchematic, Vec3i> getSchematic(int i) {
int minY = Integer.MAX_VALUE;
int minZ = Integer.MAX_VALUE;
HashMap<Vec3i, StaticSchematic> subRegions = new HashMap<>();
Level schematicWorld = SchematicWorldHandler.getSchematicWorld();

// doing this the normal way class loaded WorldSchematic too early
Supplier<Level> supplier = SchematicWorldHandler::getSchematicWorld;
Level schematicWorld = supplier.get();

for (Map.Entry<String, SubRegionPlacement> entry : placement.getEnabledRelativeSubRegionPlacements().entrySet()) {
SubRegionPlacement subPlacement = entry.getValue();
Vec3i pos = transform(subPlacement.getPos(), placement.getMirror(), placement.getRotation());
Expand Down