Update buildscript & apply automatic formatting rules

This commit is contained in:
Raven Szewczyk authored and Jason Mitchell committed 2022-06-27 10:23:18 -07:00
1 parent a7683b885d
commit f7a900e910
173 files changed
+4581 -5321

No files matched your search

+63 -77
View File
@@ -1,20 +1,18 @@
package codechicken.nei;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.ItemPanel.ItemPanelSlot;
import codechicken.nei.api.GuiInfo;
import codechicken.nei.api.INEIGuiHandler;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.GuiUsageRecipe;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.ItemPanel.ItemPanelSlot;
import java.util.ArrayList;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;
public abstract class PanelWidget extends Widget
{
public abstract class PanelWidget extends Widget {
protected static final int PADDING = 2;
public ItemStack draggedStack;
@@ -26,21 +24,18 @@ public abstract class PanelWidget extends Widget
protected ItemsGrid grid;
public ArrayList<ItemStack> getItems()
{
public ArrayList<ItemStack> getItems() {
return grid.getItems();
}
public ItemsGrid getGrid()
{
public ItemsGrid getGrid() {
return grid;
}
public void init() {
pageLabel = new Label("0/0", true);
pagePrev = new Button("Prev")
{
pagePrev = new Button("Prev") {
public boolean onButtonPress(boolean rightclick) {
if (!rightclick) {
grid.shiftPage(-1);
@@ -54,8 +49,7 @@ public abstract class PanelWidget extends Widget
return "<";
}
};
pageNext = new Button("Next")
{
pageNext = new Button("Next") {
public boolean onButtonPress(boolean rightclick) {
if (!rightclick) {
grid.shiftPage(1);
@@ -69,10 +63,8 @@ public abstract class PanelWidget extends Widget
return ">";
}
};
}
public abstract String getLabelText();
protected abstract String getPositioningSettingName();
@@ -85,19 +77,22 @@ public abstract class PanelWidget extends Widget
public abstract int getHeight(GuiContainer gui);
public void resize(GuiContainer gui)
{
final Rectangle4i margin = new Rectangle4i(getMarginLeft(gui), getMarginTop(gui), getWidth(gui), getHeight(gui));
public void resize(GuiContainer gui) {
final Rectangle4i margin =
new Rectangle4i(getMarginLeft(gui), getMarginTop(gui), getWidth(gui), getHeight(gui));
final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
final String settingName = getPositioningSettingName();
int paddingLeft = (int)Math.ceil(margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
int paddingTop = (int)Math.ceil(margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
int paddingRight = (int)Math.ceil(margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue()/ 100000.0);
int paddingBottom = (int)Math.ceil(margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
int paddingLeft = (int) Math.ceil(
margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
int paddingTop = (int) Math.ceil(
margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
int paddingRight = (int) Math.ceil(
margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
int paddingBottom = (int) Math.ceil(
margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - minHeight) / 2;
@@ -118,17 +113,25 @@ public abstract class PanelWidget extends Widget
grid.refresh(gui);
}
protected int resizeHeader(GuiContainer gui)
{
protected int resizeHeader(GuiContainer gui) {
final int BUTTON_SIZE = 16;
int paddingLeft = 0;
int paddingRight = 0;
while (paddingLeft < w && GuiInfo.hideItemPanelSlot(gui, new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
while (paddingLeft < w
&& GuiInfo.hideItemPanelSlot(
gui, new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
paddingLeft += ItemsGrid.SLOT_SIZE;
}
while (paddingRight < w && GuiInfo.hideItemPanelSlot(gui, new Rectangle4i(x + w - paddingRight - ItemsGrid.SLOT_SIZE, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
while (paddingRight < w
&& GuiInfo.hideItemPanelSlot(
gui,
new Rectangle4i(
x + w - paddingRight - ItemsGrid.SLOT_SIZE,
y,
ItemsGrid.SLOT_SIZE,
ItemsGrid.SLOT_SIZE))) {
paddingRight += ItemsGrid.SLOT_SIZE;
}
@@ -152,8 +155,7 @@ public abstract class PanelWidget extends Widget
protected abstract int resizeFooter(GuiContainer gui);
public void setVisible()
{
public void setVisible() {
if (grid.getPerPage() > 0) {
LayoutManager.addWidget(pagePrev);
LayoutManager.addWidget(pageNext);
@@ -162,14 +164,12 @@ public abstract class PanelWidget extends Widget
}
@Override
public void draw(int mousex, int mousey)
{
public void draw(int mousex, int mousey) {
grid.draw(mousex, mousey);
}
@Override
public void postDraw(int mousex, int mousey)
{
public void postDraw(int mousex, int mousey) {
if (draggedStack != null) {
GuiContainerManager.drawItems.zLevel += 100;
GuiContainerManager.drawItem(mousex - 8, mousey - 8, draggedStack);
@@ -178,28 +178,27 @@ public abstract class PanelWidget extends Widget
}
@Override
public void mouseDragged(int mousex, int mousey, int button, long heldTime)
{
if (mouseDownSlot >= 0 && draggedStack == null && NEIClientUtils.getHeldItem() == null &&
NEIClientConfig.hasSMPCounterPart() && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
if (mouseDownSlot >= 0
&& draggedStack == null
&& NEIClientUtils.getHeldItem() == null
&& NEIClientConfig.hasSMPCounterPart()
&& !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
mouseDownSlot = -1;
}
}
}
protected abstract ItemStack getDraggedStackWithQuantity(int mouseDownSlot);
@Override
public boolean handleClick(int mousex, int mousey, int button)
{
public boolean handleClick(int mousex, int mousey, int button) {
if (handleClickExt(mousex, mousey, button))
return true;
if (handleClickExt(mousex, mousey, button)) return true;
if (NEIClientUtils.getHeldItem() != null) {
@@ -208,12 +207,9 @@ public abstract class PanelWidget extends Widget
}
if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item"))
if (button == 1)
NEIClientUtils.decreaseSlotStack(-999);
else
NEIClientUtils.deleteHeldItem();
else
NEIClientUtils.dropHeldItem();
if (button == 1) NEIClientUtils.decreaseSlotStack(-999);
else NEIClientUtils.deleteHeldItem();
else NEIClientUtils.dropHeldItem();
return true;
}
@@ -230,7 +226,7 @@ public abstract class PanelWidget extends Widget
} else {
mouseDownSlot = hoverSlot.slotIndex;
}
return true;
}
@@ -238,8 +234,7 @@ public abstract class PanelWidget extends Widget
}
@Override
public boolean handleClickExt(int mouseX, int mouseY, int button)
{
public boolean handleClickExt(int mouseX, int mouseY, int button) {
if (ItemPanels.itemPanel.draggedStack != null) {
return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
}
@@ -251,8 +246,7 @@ public abstract class PanelWidget extends Widget
return false;
}
protected boolean handleDraggedClick(int mouseX, int mouseY, int button)
{
protected boolean handleDraggedClick(int mouseX, int mouseY, int button) {
if (draggedStack == null) {
return false;
}
@@ -262,15 +256,17 @@ public abstract class PanelWidget extends Widget
}
final GuiContainer gui = NEIClientUtils.getGuiContainer();
if (mouseX < gui.guiLeft || mouseY < gui.guiTop || mouseX >= gui.guiLeft + gui.xSize || mouseY >= gui.guiTop + gui.ySize) {
if (mouseX < gui.guiLeft
|| mouseY < gui.guiTop
|| mouseX >= gui.guiLeft + gui.xSize
|| mouseY >= gui.guiTop + gui.ySize) {
draggedStack = null;
}
return true;
}
protected boolean handleGUIContainerClick(int mouseX, int mouseY, int button)
{
protected boolean handleGUIContainerClick(int mouseX, int mouseY, int button) {
final GuiContainer gui = NEIClientUtils.getGuiContainer();
boolean handled = false;
@@ -294,8 +290,7 @@ public abstract class PanelWidget extends Widget
}
@Override
public void mouseUp(int mousex, int mousey, int button)
{
public void mouseUp(int mousex, int mousey, int button) {
ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
@@ -320,18 +315,15 @@ public abstract class PanelWidget extends Widget
}
@Override
public boolean onMouseWheel(int i, int mousex, int mousey)
{
if (!contains(mousex, mousey))
return false;
public boolean onMouseWheel(int i, int mousex, int mousey) {
if (!contains(mousex, mousey)) return false;
grid.shiftPage(-i);
return true;
}
@Override
public boolean handleKeyPress(int keyID, char keyChar)
{
public boolean handleKeyPress(int keyID, char keyChar) {
if (keyID == NEIClientConfig.getKeyBinding("gui.next")) {
grid.shiftPage(1);
@@ -347,31 +339,25 @@ public abstract class PanelWidget extends Widget
}
@Override
public ItemStack getStackMouseOver(int mousex, int mousey)
{
public ItemStack getStackMouseOver(int mousex, int mousey) {
ItemPanelSlot slot = getSlotMouseOver(mousex, mousey);
return slot == null ? null : slot.item;
}
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey)
{
public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
return grid.getSlotMouseOver(mousex, mousey);
}
public int getPage()
{
public int getPage() {
return grid.getPage();
}
public int getNumPages()
{
public int getNumPages() {
return grid.getNumPages();
}
@Override
public boolean contains(int px, int py)
{
public boolean contains(int px, int py) {
return grid.contains(px, py);
}
}