mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-20 20:22:17 +00:00
Compare commits
22
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fc80371c7 | ||
|
|
f5f696abba | ||
|
|
277c32b9e6 | ||
|
|
fbb0cdc81a | ||
|
|
991e166e0a | ||
|
|
d298c0e827 | ||
|
|
da16b40f36 | ||
|
|
651b59cba9 | ||
|
|
f922d7ef1e | ||
|
|
52ad6f38a5 | ||
|
|
8d118cb132 | ||
|
|
2590eec44a | ||
|
|
81a92a28f5 | ||
|
|
621ab621c7 | ||
|
|
1aa4d56100 | ||
|
|
dc35985ea0 | ||
|
|
bb8632a012 | ||
|
|
b361604422 | ||
|
|
02c97a05c3 | ||
|
|
d0785b5261 | ||
|
|
52ae4b2bd4 | ||
|
|
acacd13bd9 |
No files matched your search
@@ -713,8 +713,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void load(GuiContainer gui) {
|
public void load(GuiContainer gui) {
|
||||||
NEIController.load(gui);
|
|
||||||
|
|
||||||
if (isEnabled()) {
|
if (isEnabled()) {
|
||||||
setInputFocused(null);
|
setInputFocused(null);
|
||||||
|
|
||||||
@@ -728,6 +726,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
|
|||||||
AutoFocusWidget.instance.load(gui);
|
AutoFocusWidget.instance.load(gui);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NEIController.load(gui);
|
||||||
|
|
||||||
if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with
|
if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with
|
||||||
// creative+
|
// creative+
|
||||||
gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
|
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
|
* {@link #moveTo} reads the chunk, the height map and the biome of a column, and {@link #scan} reads the column's
|
||||||
* column's blocks.
|
* blocks.
|
||||||
*/
|
*/
|
||||||
private final class Column {
|
private final class Column {
|
||||||
|
|
||||||
@@ -285,14 +285,15 @@ public final class MobOverlayScan {
|
|||||||
canBiomeSpawn = !biome.getSpawnableList(EnumCreatureType.monster).isEmpty()
|
canBiomeSpawn = !biome.getSpawnableList(EnumCreatureType.monster).isEmpty()
|
||||||
&& biome.getSpawningChance() > 0;
|
&& biome.getSpawningChance() > 0;
|
||||||
chunk = scannedWorld.getChunkFromBlockCoords(x, z);
|
chunk = scannedWorld.getChunkFromBlockCoords(x, z);
|
||||||
// `getHeightValue()` is the height above the highest block with a light opacity above 0. A block with a
|
// on the client, `Chunk.generateHeightMap()` never tests the top layer of the highest non-empty section.
|
||||||
// light opacity of 0 can be higher: Tinkers' Construct slime grass, a hopper or a snow layer. A mob can
|
// `getHeightValue()` can then be below a block on that layer, so test that layer here
|
||||||
// spawn on top of slime grass, a hopper or a full snow block. Search the blocks for the highest non-air
|
final int topLayerY = chunk.getTopFilledSegment() + 15;
|
||||||
// block
|
final boolean isTopLayerFilled = !chunk.isEmpty() && chunk.func_150808_b(x & 15, topLayerY, z & 15) != 0;
|
||||||
final int SECTION_HEIGHT = 16;
|
final int heightValue = isTopLayerFilled ? topLayerY + 1 : scannedWorld.getHeightValue(x, z);
|
||||||
int y = Math.min(minY + height - 1, chunk.getTopFilledSegment() + SECTION_HEIGHT - 1);
|
// `getHeightValue()` is the height above the highest block with a light opacity above 0. A snow layer and a
|
||||||
while (y >= minY && chunk.getBlock(x & 15, y, z & 15).isAir(chunk.worldObj, x, y, z)) y--;
|
// hopper have a light opacity of 0, and a mob can spawn on top of a full snow block or a hopper, so scan
|
||||||
topY = y + 1;
|
// 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 */
|
/** @return whether a spawn mode or the top of a flat block changed */
|
||||||
|
|||||||
@@ -123,6 +123,11 @@ public class AutoCraftingManager {
|
|||||||
AutoCraftingManager.math = math;
|
AutoCraftingManager.math = math;
|
||||||
|
|
||||||
if (AutoCraftingManager.math != null) {
|
if (AutoCraftingManager.math != null) {
|
||||||
|
|
||||||
|
if (NEIClientUtils.getGuiContainer() instanceof GuiRecipe<?>gui && gui.firstGui != null) {
|
||||||
|
gui.mc.displayGuiScreen(gui.firstGui);
|
||||||
|
}
|
||||||
|
|
||||||
ItemPanels.bookmarkPanel.clearTooltips();
|
ItemPanels.bookmarkPanel.clearTooltips();
|
||||||
math.createMasterRoot();
|
math.createMasterRoot();
|
||||||
task.restart();
|
task.restart();
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ public class RecipeHandlerRef {
|
|||||||
if (overlayHandler != null && overlayHandler.canCraft(firstGui, this.handler, this.recipeIndex)) {
|
if (overlayHandler != null && overlayHandler.canCraft(firstGui, this.handler, this.recipeIndex)) {
|
||||||
|
|
||||||
if (!firstGui.equals(firstGui.mc.currentScreen)) {
|
if (!firstGui.equals(firstGui.mc.currentScreen)) {
|
||||||
|
if (!firstGui.mc.func_152345_ab()) return false;
|
||||||
firstGui.mc.displayGuiScreen(firstGui);
|
firstGui.mc.displayGuiScreen(firstGui);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user