Motschen/MidnightControls
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightControls.git synced 2025-12-14 07:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

MidnightControls 1.3.0 - Fixes and Improvements

Browse Source 
- Merge #48 (Split rotation speed in X and Y, thanks to @ronniedude)
- Merge #47 (Korean translations by @gyular)
- Fix #50 (Stack pick-up problems in survival mode)
- Add some compatibility measures for EMI (Will likely be improved further in the future)
- Remove all REI-related code (not working anyway, EMI is better)
- Possibly fix #41 (Random crashes when changing keybinds)
This commit is contained in:
Motschen
2022-06-30 21:29:59 +02:00
parent 3ddae57eab
commit df7c7bbdad
14 changed files with 53 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
View File

@@ -28,6 +28,7 @@ import net.minecraft.client.gui.screen.ingame.HandledScreen;
import net.minecraft.client.gui.screen.ingame.InventoryScreen;
import net.minecraft.client.util.ScreenshotRecorder;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.Items;
import net.minecraft.screen.slot.Slot;
import net.minecraft.screen.slot.SlotActionType;
import org.aperlambda.lambdacommon.utils.Pair;
@@ -142,22 +143,29 @@ public class InputHandlers {
int slotId;
if (slot == null) {
if (client.player.currentScreenHandler.getCursorStack().isEmpty())
if (button.getName().equals("take_all")) {
return false;
}
slotId = accessor.midnightcontrols$isClickOutsideBounds(x, y, accessor.getX(), accessor.getY(), GLFW_MOUSE_BUTTON_1) ? -999 : -1;
} else {
slotId = slot.id;
}
var actionType = SlotActionType.PICKUP;
int clickData = GLFW.GLFW_MOUSE_BUTTON_1;
MidnightControlsClient.get().input.inventoryInteractionCooldown = 5;
switch (button.getName()) {
case "take_all":
if (accessor instanceof CreativeInventoryScreen)
if (accessor instanceof CreativeInventoryScreen) {
if (((CreativeInventoryScreenAccessor) accessor).midnightcontrols$isCreativeInventorySlot(slot))
actionType = SlotActionType.CLONE;
if (slot != null && MidnightControlsCompat.streamCompatHandlers().anyMatch(handler -> handler.isCreativeSlot(screen, slot)))
actionType = SlotActionType.CLONE;
if (slot != null && MidnightControlsCompat.streamCompatHandlers().anyMatch(handler -> handler.isCreativeSlot(screen, slot)))
actionType = SlotActionType.CLONE;
} else {
if (slot != null && screen.getScreenHandler().getCursorStack() != null) {
return screen.mouseReleased(x, y, GLFW.GLFW_MOUSE_BUTTON_1);
} else actionType = SlotActionType.PICKUP_ALL;
}
break;
case "take":
clickData = GLFW_MOUSE_BUTTON_2;