Compare commits

..
Author SHA1 Message Date
boubou19andslprime 7fc80371c7 Copy fluid registry name instead of the display item id (#1122) (#1145)
Co-authored-by: slprime <[email protected]>
2026-11-19 08:17:47 +01:00
f5f696abba Add NEI mob spawn overlay variants (#1111) (#1144)
Co-authored-by: OrderedSet86 <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <[email protected]>
2026-11-19 08:15:31 +01:00
boubou19andslprime 277c32b9e6 Don't toggle handler info widget while typing in recipe search (#1121) (#1143)
Co-authored-by: slprime <[email protected]>
2026-11-19 08:13:15 +01:00
boubou19andslprime fbb0cdc81a Add recipe text search with ~ prefix (#1120) (#1142)
Co-authored-by: slprime <[email protected]>
2026-11-19 08:11:11 +01:00
boubou19andslprime 991e166e0a Speed up GUID cache and bookmark recipe lookups (#1119) (#1141)
Co-authored-by: slprime <[email protected]>
2026-11-19 08:08:48 +01:00
d298c0e827 Don't copy stack unless it changed (#1116) (#1140)
Co-authored-by: DarkShadow44 <[email protected]>
Co-authored-by: slprime <[email protected]>
2026-11-19 08:06:32 +01:00
boubou19andslprime da16b40f36 Optimize GUI overlap scan for item panels (#1118) (#1139)
Co-authored-by: slprime <[email protected]>
2026-11-19 08:02:56 +01:00
boubou19andslprime 651b59cba9 Fix WorldClient leak after leaving the world (#1115) (#1138)
Co-authored-by: slprime <[email protected]>
2026-11-19 08:00:50 +01:00
boubou19andslprime f922d7ef1e Make name optional in API.addCollapsibleGroup (#1114) (#1137)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:57:05 +01:00
boubou19andslprime 52ad6f38a5 Add API.addCollapsibleGroup for registering collapsible item groups (#1113) (#1136)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:52:58 +01:00
boubou19andslprime 8d118cb132 Rollback fluent setters in PositionedStack added in #1106 (#1110) (#1135)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:50:30 +01:00
boubou19andslprime 2590eec44a Fix NPE in StackInfo.getItemStackWithMinimumDamage for unregistered items (#1109) (#1134)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:48:46 +01:00
boubou19andslprime 81a92a28f5 Remove creative tab style option for recipe tabs (#1107) (#1133)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:46:47 +01:00
boubou19andslprime 621ab621c7 Move RecipeTransferRectHandler out of TemplateRecipeHandler and tidy up PositionedStack (#1106) (#1132)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:44:56 +01:00
boubou19andslprime 1aa4d56100 Add getResultStacks/getAuxiliaryStacks to IRecipeHandler (#1105) (#1131)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:42:56 +01:00
boubou19andslprime dc35985ea0 Stop auto-creating NEI config files, add export buttons instead (#1104) (#1130)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:40:46 +01:00
boubou19andslprime bb8632a012 Fix ConcurrentModificationException when iterating the crafting recipe list (#1103) (#1129)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:38:03 +01:00
b361604422 Remove per-world config override (#1094) (#1128)
Co-authored-by: slprime <[email protected]>
Co-authored-by: Martin Robertz <[email protected]>
2026-11-19 07:35:55 +01:00
boubou19andslprime 02c97a05c3 Remove hardcoded vanilla block name overrides (#1102) (#1127)
Co-authored-by: slprime <[email protected]>
2026-11-19 07:33:11 +01:00
boubou19andArmisael5 d0785b5261 Add NEI Recipe Exporting (#1100) (#1126)
Co-authored-by: Armisael5 <[email protected]>
2026-11-19 07:31:13 +01:00
UltraProdigy 52ae4b2bd4 ci: run build and test on release branches 2026-11-09 01:11:41 -05:00
slprime acacd13bd9 Fix autocraft crash when started from the recipe screen (#1108) 2026-11-06 00:31:19 +02:00
4 changed files with 19 additions and 12 deletions

No files matched your search

@@ -713,8 +713,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
@Override
public void load(GuiContainer gui) {
NEIController.load(gui);
if (isEnabled()) {
setInputFocused(null);
@@ -728,6 +726,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
AutoFocusWidget.instance.load(gui);
}
NEIController.load(gui);
if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with
// creative+
gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
@@ -265,8 +265,8 @@ public final class MobOverlayScan {
}
/**
* {@link #moveTo} reads a column's chunk, biome and highest non-air block in the box, and {@link #scan} reads the
* column's blocks.
* {@link #moveTo} reads the chunk, the height map and the biome of a column, and {@link #scan} reads the column's
* blocks.
*/
private final class Column {
@@ -285,14 +285,15 @@ public final class MobOverlayScan {
canBiomeSpawn = !biome.getSpawnableList(EnumCreatureType.monster).isEmpty()
&& biome.getSpawningChance() > 0;
chunk = scannedWorld.getChunkFromBlockCoords(x, z);
// `getHeightValue()` is the height above the highest block with a light opacity above 0. A block with a
// light opacity of 0 can be higher: Tinkers' Construct slime grass, a hopper or a snow layer. A mob can
// spawn on top of slime grass, a hopper or a full snow block. Search the blocks for the highest non-air
// block
final int SECTION_HEIGHT = 16;
int y = Math.min(minY + height - 1, chunk.getTopFilledSegment() + SECTION_HEIGHT - 1);
while (y >= minY && chunk.getBlock(x & 15, y, z & 15).isAir(chunk.worldObj, x, y, z)) y--;
topY = y + 1;
// on the client, `Chunk.generateHeightMap()` never tests the top layer of the highest non-empty section.
// `getHeightValue()` can then be below a block on that layer, so test that layer here
final int topLayerY = chunk.getTopFilledSegment() + 15;
final boolean isTopLayerFilled = !chunk.isEmpty() && chunk.func_150808_b(x & 15, topLayerY, z & 15) != 0;
final int heightValue = isTopLayerFilled ? topLayerY + 1 : scannedWorld.getHeightValue(x, z);
// `getHeightValue()` is the height above the highest block with a light opacity above 0. A snow layer and a
// hopper have a light opacity of 0, and a mob can spawn on top of a full snow block or a hopper, so scan
// one block above the height value
topY = Math.min(scannedWorld.getHeight() - 1, heightValue + 1);
}
/** @return whether a spawn mode or the top of a flat block changed */
@@ -123,6 +123,11 @@ public class AutoCraftingManager {
AutoCraftingManager.math = math;
if (AutoCraftingManager.math != null) {
if (NEIClientUtils.getGuiContainer() instanceof GuiRecipe<?>gui && gui.firstGui != null) {
gui.mc.displayGuiScreen(gui.firstGui);
}
ItemPanels.bookmarkPanel.clearTooltips();
math.createMasterRoot();
task.restart();
@@ -149,6 +149,7 @@ public class RecipeHandlerRef {
if (overlayHandler != null && overlayHandler.canCraft(firstGui, this.handler, this.recipeIndex)) {
if (!firstGui.equals(firstGui.mc.currentScreen)) {
if (!firstGui.mc.func_152345_ab()) return false;
firstGui.mc.displayGuiScreen(firstGui);
}