Removed commented out code and applied formatting

AppliedEnergistics · Jun 13, 2024 · 9f1d3a7 · 9f1d3a7
1 parent d99451f
commit 9f1d3a7
Show file tree

Hide file tree

Showing 134 changed files with 7,159 additions and 5,674 deletions.
diff --git a/src/main/java/appeng/api/config/ActionItems.java b/src/main/java/appeng/api/config/ActionItems.java
@@ -24,5 +24,6 @@
 package appeng.api.config;
 
 public enum ActionItems {
-    COG, CLOSE, S_CLOSE, STASH, S_STASH, STASH_TO_PLAYER_INV, S_STASH_TO_PLAYER_INV, ENCODE, CYCLE_PROCESSING_OUTPUT, S_CYCLE_PROCESSING_OUTPUT, TERMINAL_SETTINGS
+    COG, CLOSE, S_CLOSE, STASH, S_STASH, STASH_TO_PLAYER_INV, S_STASH_TO_PLAYER_INV, ENCODE, CYCLE_PROCESSING_OUTPUT,
+    S_CYCLE_PROCESSING_OUTPUT, TERMINAL_SETTINGS
 }
diff --git a/src/main/java/appeng/api/util/AEColor.java b/src/main/java/appeng/api/util/AEColor.java
@@ -45,7 +45,8 @@
 public enum AEColor implements StringRepresentable {
     // TODO (Rid): Sorted the colours based on the colour wheel.
     WHITE("White", "gui.ae2.White", "white", DyeColor.WHITE, 0xb4b4b4, 0xe0e0e0, 0xf9f9f9, 0x000000),
-    LIGHT_GRAY("Light Gray", "gui.ae2.LightGray", "light_gray", DyeColor.LIGHT_GRAY, 0x7e7e7e, 0xa09fa0, 0xc4c4c4, 0x000000),
+    LIGHT_GRAY("Light Gray", "gui.ae2.LightGray", "light_gray", DyeColor.LIGHT_GRAY, 0x7e7e7e, 0xa09fa0, 0xc4c4c4,
+            0x000000),
     GRAY("Gray", "gui.ae2.Gray", "gray", DyeColor.GRAY, 0x4f4f4f, 0x6c6b6c, 0x949294, 0x000000),
     BLACK("Black", "gui.ae2.Black", "black", DyeColor.BLACK, 0x131313, 0x272727, 0x3b3b3b, 0xFFFFFF),
     LIME("Lime", "gui.ae2.Lime", "lime", DyeColor.LIME, 0x4ec04e, 0x70e259, 0xb3f86d, 0x000000),
@@ -57,7 +58,8 @@ public enum AEColor implements StringRepresentable {
     MAGENTA("Magenta", "gui.ae2.Magenta", "magenta", DyeColor.MAGENTA, 0xc15189, 0xd5719c, 0xe69ebf, 0x000000),
     PURPLE("Purple", "gui.ae2.Purple", "purple", DyeColor.PURPLE, 0x6e5cb8, 0x915dcd, 0xb06fdd, 0x000000),
     BLUE("Blue", "gui.ae2.Blue", "blue", DyeColor.BLUE, 0x337ff0, 0x3894ff, 0x40c1ff, 0x000000),
-    LIGHT_BLUE("Light Blue", "gui.ae2.LightBlue", "light_blue", DyeColor.LIGHT_BLUE, 0x69b9ff, 0x70d2ff, 0x80f7ff, 0x000000),
+    LIGHT_BLUE("Light Blue", "gui.ae2.LightBlue", "light_blue", DyeColor.LIGHT_BLUE, 0x69b9ff, 0x70d2ff, 0x80f7ff,
+            0x000000),
     CYAN("Cyan", "gui.ae2.Cyan", "cyan", DyeColor.CYAN, 0x22b0ae, 0x2fccb7, 0x65e8c9, 0x000000),
     GREEN("Green", "gui.ae2.Green", "green", DyeColor.GREEN, 0x079b6b, 0x17b86d, 0x32d850, 0x000000),
     TRANSPARENT("Fluix", "gui.ae2.Fluix", "fluix", null, 0x5a479e, 0x915dcd, 0xe2a3e3, 0x000000);

diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java
@@ -27,7 +27,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import appeng.client.gui.implementations.SkyChestScreen;
 import com.google.common.base.Stopwatch;
 import com.mojang.blaze3d.platform.InputConstants;
 
@@ -150,7 +149,8 @@ public AEBaseScreen(T menu, Inventory playerInventory, Component title, ScreenSt
         this.verticalToolbar = new VerticalButtonBar();
 //        this.widgets.add("verticalToolbar", this.verticalToolbar = new VerticalButtonBar());
 
-        // TODO (RID): Added a check if a Screen should have the Vertical Tool Bar. This was added to avoid rendering the bar from the SkyChestScreen.
+        // TODO (RID): Added a check if a Screen should have the Vertical Tool Bar. This was added to avoid rendering
+        // the bar from the SkyChestScreen.
         if (shouldAddToolbar()) {
             this.widgets.add("verticalToolbar", this.verticalToolbar);
         }
@@ -264,10 +264,14 @@ public void render(GuiGraphics guiGraphics, int mouseX, int mouseY, float partia
 
         // Added a custom slot highlight effect - RID
         if (this.hoveredSlot != null) {
-            guiGraphics.hLine(leftPos + this.hoveredSlot.x, leftPos + this.hoveredSlot.x + 16, topPos + this.hoveredSlot.y - 1, 0xFFdaffff);
-            guiGraphics.hLine(leftPos + this.hoveredSlot.x - 1, leftPos + this.hoveredSlot.x + 16, topPos + this.hoveredSlot.y + 16, 0xFFdaffff);
-            guiGraphics.vLine(leftPos + this.hoveredSlot.x - 1, topPos + this.hoveredSlot.y - 2, topPos + this.hoveredSlot.y + 16, 0xFFdaffff);
-            guiGraphics.vLine(leftPos + this.hoveredSlot.x + 16, topPos + this.hoveredSlot.y - 2, topPos + this.hoveredSlot.y + 16, 0xFFdaffff);
+            guiGraphics.hLine(leftPos + this.hoveredSlot.x, leftPos + this.hoveredSlot.x + 16,
+                    topPos + this.hoveredSlot.y - 1, 0xFFdaffff);
+            guiGraphics.hLine(leftPos + this.hoveredSlot.x - 1, leftPos + this.hoveredSlot.x + 16,
+                    topPos + this.hoveredSlot.y + 16, 0xFFdaffff);
+            guiGraphics.vLine(leftPos + this.hoveredSlot.x - 1, topPos + this.hoveredSlot.y - 2,
+                    topPos + this.hoveredSlot.y + 16, 0xFFdaffff);
+            guiGraphics.vLine(leftPos + this.hoveredSlot.x + 16, topPos + this.hoveredSlot.y - 2,
+                    topPos + this.hoveredSlot.y + 16, 0xFFdaffff);
             renderSlotHighlight(guiGraphics, leftPos + this.hoveredSlot.x, topPos + this.hoveredSlot.y, 0, 0x669cd3ff);
         }
 

diff --git a/src/main/java/appeng/client/gui/Icon.java b/src/main/java/appeng/client/gui/Icon.java
@@ -55,7 +55,7 @@ public enum Icon {
     VIEW_MODE_CRAFTING(48, 16),
     BLOCKING_MODE_NO(64, 16),
     BLOCKING_MODE_YES(80, 16),
-    BACK (96, 16),
+    BACK(96, 16),
     TRANSPARENT_FACADES_OFF(96, 16),
     TRANSPARENT_FACADES_ON(112, 16),
     TYPE_FILTER_ITEMS(128, 16),
@@ -150,7 +150,7 @@ public enum Icon {
     HORIZONTAL_TAB_FOCUS(150, 128, 22, 22),
     BACKGROUND_BLANK_PATTERN(240, 128),
     TOOLBAR_BUTTON_BACKGROUND(176, 128, 18, 20),
-    TOOLBAR_BUTTON_BACKGROUND_HOVER(208 , 128, 18 ,20),
+    TOOLBAR_BUTTON_BACKGROUND_HOVER(208, 128, 18, 20),
 
     // ROW 9
     ACCESS_WRITE(0, 144),

diff --git a/src/main/java/appeng/client/gui/WidgetContainer.java b/src/main/java/appeng/client/gui/WidgetContainer.java
@@ -23,7 +23,6 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
-import appeng.client.gui.widgets.*;
 import com.google.common.base.Preconditions;
 
 import org.jetbrains.annotations.Nullable;
@@ -33,13 +32,20 @@
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button.OnPress;
 import net.minecraft.client.renderer.Rect2i;
-import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.network.chat.Component;
 import net.neoforged.neoforge.network.PacketDistributor;
 
 import appeng.client.Point;
 import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.style.WidgetStyle;
+import appeng.client.gui.widgets.AE2Button;
+import appeng.client.gui.widgets.AECheckbox;
+import appeng.client.gui.widgets.AETextField;
+import appeng.client.gui.widgets.BackgroundPanel;
+import appeng.client.gui.widgets.IResizableWidget;
+import appeng.client.gui.widgets.NumberEntryWidget;
+import appeng.client.gui.widgets.Scrollbar;
+import appeng.client.gui.widgets.TabButton;
 import appeng.core.localization.GuiText;
 import appeng.core.network.ServerboundPacket;
 import appeng.core.network.serverbound.SwitchGuisPacket;

diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java
@@ -18,14 +18,12 @@
 
 package appeng.client.gui.implementations;
 
-import appeng.client.gui.Icon;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.network.chat.Component;
 import net.neoforged.neoforge.network.PacketDistributor;
 
+import appeng.client.gui.Icon;
 import appeng.client.gui.WidgetContainer;
 import appeng.client.gui.widgets.TabButton;
 import appeng.core.network.ServerboundPacket;

diff --git a/src/main/java/appeng/client/gui/implementations/PatternProviderLockReason.java b/src/main/java/appeng/client/gui/implementations/PatternProviderLockReason.java
@@ -1,14 +1,13 @@
 package appeng.client.gui.implementations;
 
-import net.minecraft.network.chat.Style;
-import net.minecraft.util.Mth;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.Style;
+import net.minecraft.util.Mth;
 
 import appeng.api.client.AEKeyRendering;
 import appeng.api.config.LockCraftingMode;
@@ -64,11 +63,11 @@ public void drawForegroundLayer(GuiGraphics guiGraphics, Rect2i bounds, Point mo
         if (menu.getCraftingLockedReason() == LockCraftingMode.NONE) {
             icon = Icon.UNLOCKED;
             lockStatusText = GuiText.CraftingLockIsUnlocked.text()
-                    .setStyle(Style.EMPTY.withColor(Mth.color(125/255f, 169/255f, 210/255f)));
+                    .setStyle(Style.EMPTY.withColor(Mth.color(125 / 255f, 169 / 255f, 210 / 255f)));
         } else {
             icon = Icon.LOCKED;
             lockStatusText = GuiText.CraftingLockIsLocked.text()
-                    .setStyle(Style.EMPTY.withColor(Mth.color(193/255f, 66/255f, 75/255f)));
+                    .setStyle(Style.EMPTY.withColor(Mth.color(193 / 255f, 66 / 255f, 75 / 255f)));
         }
 
         icon.getBlitter().dest(x, y).blit(guiGraphics);

diff --git a/src/main/java/appeng/client/gui/me/common/StackSizeRenderer.java b/src/main/java/appeng/client/gui/me/common/StackSizeRenderer.java
@@ -44,10 +44,12 @@ private static void renderSizeLabel(Matrix4f matrix, Font fontRenderer, float xP
         final int offset = largeFonts ? 0 : -1;
 
         RenderSystem.disableBlend();
-        final int X = (int) ((xPos + offset + 16.0f + 2.0f - fontRenderer.width(text) * scaleFactor) * inverseScaleFactor);
+        final int X = (int) ((xPos + offset + 16.0f + 2.0f - fontRenderer.width(text) * scaleFactor)
+                * inverseScaleFactor);
         final int Y = (int) ((yPos + offset + 16.0f - 5.0f * scaleFactor) * inverseScaleFactor);
         BufferSource buffer = MultiBufferSource.immediate(Tesselator.getInstance().getBuilder());
-        fontRenderer.drawInBatch(text, X+1, Y+1, 0x413f54, false, matrix, buffer, Font.DisplayMode.NORMAL, 0, 15728880);
+        fontRenderer.drawInBatch(text, X + 1, Y + 1, 0x413f54, false, matrix, buffer, Font.DisplayMode.NORMAL, 0,
+                15728880);
         fontRenderer.drawInBatch(text, X, Y, 0xffffff, false, matrix, buffer, Font.DisplayMode.NORMAL, 0, 15728880);
         buffer.endBatch();
         RenderSystem.enableBlend();

diff --git a/src/main/java/appeng/client/gui/me/common/TerminalSettingsScreen.java b/src/main/java/appeng/client/gui/me/common/TerminalSettingsScreen.java
@@ -1,11 +1,9 @@
 package appeng.client.gui.me.common;
 
-import appeng.client.gui.Icon;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.network.chat.Component;
 
 import appeng.client.gui.AESubScreen;
+import appeng.client.gui.Icon;
 import appeng.client.gui.widgets.AECheckbox;
 import appeng.client.gui.widgets.TabButton;
 import appeng.core.localization.GuiText;

diff --git a/src/main/java/appeng/client/gui/me/crafting/CraftAmountScreen.java b/src/main/java/appeng/client/gui/me/crafting/CraftAmountScreen.java
@@ -18,11 +18,8 @@
 
 package appeng.client.gui.me.crafting;
 
-import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
-import net.minecraft.util.Mth;
 import net.minecraft.world.entity.player.Inventory;
 
 import appeng.client.gui.AEBaseScreen;

diff --git a/src/main/java/appeng/client/gui/me/crafting/CraftConfirmScreen.java b/src/main/java/appeng/client/gui/me/crafting/CraftConfirmScreen.java
@@ -20,7 +20,6 @@
 
 import java.text.NumberFormat;
 
-import net.minecraft.ChatFormatting;
 import org.lwjgl.glfw.GLFW;
 
 import net.minecraft.client.gui.GuiGraphics;

diff --git a/src/main/java/appeng/client/gui/me/crafting/CraftingStatusScreen.java b/src/main/java/appeng/client/gui/me/crafting/CraftingStatusScreen.java
@@ -18,13 +18,13 @@
 
 package appeng.client.gui.me.crafting;
 
-import appeng.client.gui.widgets.Scrollbar;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
 import appeng.client.gui.implementations.AESubScreen;
 import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.widgets.CPUSelectionList;
+import appeng.client.gui.widgets.Scrollbar;
 import appeng.menu.me.crafting.CraftingStatusMenu;
 
 /**

diff --git a/src/main/java/appeng/client/gui/me/items/CraftingEncodingPanel.java b/src/main/java/appeng/client/gui/me/items/CraftingEncodingPanel.java
@@ -6,8 +6,6 @@
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 
 import appeng.api.config.ActionItems;
 import appeng.client.Point;
@@ -40,11 +38,6 @@ public CraftingEncodingPanel(PatternEncodingTermScreen<?> screen, WidgetContaine
         this.fluidSubstitutionsBtn = createCraftingFluidSubstitutionButton(widgets);
     }
 
-//    @Override
-//    public ItemStack getTabIconItem() {
-//        return Items.CRAFTING_TABLE.getDefaultInstance();
-//    }
-
     @Override
     Icon getIcon() {
         return Icon.TAB_CRAFTING;

diff --git a/src/main/java/appeng/client/gui/me/items/EncodingModePanel.java b/src/main/java/appeng/client/gui/me/items/EncodingModePanel.java
@@ -1,12 +1,11 @@
 package appeng.client.gui.me.items;
 
-import appeng.client.gui.Icon;
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.ItemStack;
 
 import appeng.client.Point;
 import appeng.client.gui.ICompositeWidget;
+import appeng.client.gui.Icon;
 import appeng.client.gui.WidgetContainer;
 import appeng.menu.me.items.PatternEncodingTermMenu;
 
@@ -28,6 +27,7 @@ public EncodingModePanel(PatternEncodingTermScreen<?> screen, WidgetContainer wi
 //    abstract ItemStack getTabIconItem();
 
     abstract Icon getIcon();
+
     abstract Component getTabTooltip();
 
     @Override

diff --git a/src/main/java/appeng/client/gui/me/items/ProcessingEncodingPanel.java b/src/main/java/appeng/client/gui/me/items/ProcessingEncodingPanel.java
@@ -1,14 +1,12 @@
 package appeng.client.gui.me.items;
 
-import appeng.client.gui.Icon;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.Rect2i;
 import net.minecraft.network.chat.Component;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 
 import appeng.api.config.ActionItems;
 import appeng.client.Point;
+import appeng.client.gui.Icon;
 import appeng.client.gui.WidgetContainer;
 import appeng.client.gui.style.Blitter;
 import appeng.client.gui.widgets.ActionButton;
@@ -87,11 +85,6 @@ private void updateTooltipVisibility() {
         widgets.setTooltipAreaEnabled("processing-optional-output3", visible);
     }
 
-//    @Override
-//    public ItemStack getTabIconItem() {
-//        return Items.FURNACE.getDefaultInstance();
-//    }
-
     @Override
     Icon getIcon() {
         return Icon.TAB_PROCESSING;

diff --git a/src/main/java/appeng/client/gui/me/items/SmithingTableEncodingPanel.java b/src/main/java/appeng/client/gui/me/items/SmithingTableEncodingPanel.java
@@ -8,7 +8,6 @@
 import net.minecraft.world.SimpleContainer;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.RecipeType;
 
 import appeng.api.config.ActionItems;
@@ -43,11 +42,6 @@ public SmithingTableEncodingPanel(PatternEncodingTermScreen<?> screen, WidgetCon
         menu.addClientSideSlot(resultSlot, SlotSemantics.SMITHING_TABLE_RESULT);
     }
 
-//    @Override
-//    public ItemStack getTabIconItem() {
-//        return Items.SMITHING_TABLE.getDefaultInstance();
-//    }
-
     @Override
     Icon getIcon() {
         return Icon.TAB_SMITHING;

diff --git a/src/main/java/appeng/client/gui/me/items/StonecuttingEncodingPanel.java b/src/main/java/appeng/client/gui/me/items/StonecuttingEncodingPanel.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 
-import appeng.client.gui.Icon;
 import org.jetbrains.annotations.Nullable;
 
 import net.minecraft.client.Minecraft;
@@ -13,11 +12,11 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.RecipeHolder;
 import net.minecraft.world.item.crafting.StonecutterRecipe;
 
 import appeng.client.Point;
+import appeng.client.gui.Icon;
 import appeng.client.gui.Tooltip;
 import appeng.client.gui.WidgetContainer;
 import appeng.client.gui.style.Blitter;
@@ -159,11 +158,6 @@ public boolean onMouseWheel(Point mousePos, double delta) {
         return scrollbar.onMouseWheel(mousePos, delta);
     }
 
-//    @Override
-//    public ItemStack getTabIconItem() {
-//        return new ItemStack(Items.STONECUTTER);
-//    }
-
     @Override
     Icon getIcon() {
         return Icon.TAB_STONECUTTING;