sbobless

GregTechCEu · Jan 19, 2024 · 555f9a1 · 555f9a1
1 parent 82cc354
commit 555f9a1
Show file tree

Hide file tree

Showing 39 changed files with 394 additions and 393 deletions.
diff --git a/src/main/java/gregtech/api/gui/widgets/PhantomFluidWidget.java b/src/main/java/gregtech/api/gui/widgets/PhantomFluidWidget.java
@@ -13,7 +13,6 @@
 import gregtech.api.util.TextFormattingUtil;
 import gregtech.client.utils.RenderUtil;
 import gregtech.client.utils.TooltipHelper;
-import gregtech.common.covers.filter.SimpleFluidFilter;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;

diff --git a/src/main/java/gregtech/api/mui/GTGuiTextures.java b/src/main/java/gregtech/api/mui/GTGuiTextures.java
@@ -157,11 +157,12 @@ public static class IDs {
     public static final UITexture[] BUTTON_BLACKLIST = slice("textures/gui/widget/button_blacklist.png",
             16, 32, 16, 16, true);
     public static final UITexture[] BUTTON_IGNORE_DAMAGE = slice("textures/gui/widget/button_filter_damage.png",
-        16, 32, 16, 16,true);
+            16, 32, 16, 16, true);
     public static final UITexture[] BUTTON_IGNORE_NBT = slice("textures/gui/widget/button_filter_nbt.png",
-            16, 32, 16, 16,true);
+            16, 32, 16, 16, true);
 
-    public static final UITexture[] BUTTON_CASE_SENSITIVE = slice("textures/gui/widget/ore_filter/button_case_sensitive.png",
+    public static final UITexture[] BUTTON_CASE_SENSITIVE = slice(
+            "textures/gui/widget/ore_filter/button_case_sensitive.png",
             16, 32, 16, 16, true);
 
     public static final UITexture[] BUTTON_MATCH_ALL = slice("textures/gui/widget/ore_filter/button_match_all.png",
@@ -484,7 +485,8 @@ private static UITexture fullImage(String path, boolean canApplyTheme) {
     }
 
     @SuppressWarnings("SameParameterValue")
-    private static UITexture[] slice(String path, int imageWidth, int imageHeight, int sliceWidth, int sliceHeight, boolean canApplyTheme) {
+    private static UITexture[] slice(String path, int imageWidth, int imageHeight, int sliceWidth, int sliceHeight,
+                                     boolean canApplyTheme) {
         if (imageWidth % sliceWidth != 0 || imageHeight % sliceHeight != 0)
             throw new IllegalArgumentException("Slice height and slice width must divide the image evenly!");
 

diff --git a/src/main/java/gregtech/api/mui/slot/PhantomItemSlot.java b/src/main/java/gregtech/api/mui/slot/PhantomItemSlot.java
@@ -1,13 +1,15 @@
 package gregtech.api.mui.slot;
 
-import com.cleanroommc.modularui.widgets.slot.ModularSlot;
-
 import net.minecraftforge.items.IItemHandler;
 
+import com.cleanroommc.modularui.widgets.slot.ModularSlot;
+
 import java.util.function.Supplier;
 
 public class PhantomItemSlot extends ModularSlot {
+
     protected Supplier<Integer> maxStackSizer;
+
     public PhantomItemSlot(IItemHandler itemHandler, int index, Supplier<Integer> maxStackSizer) {
         super(itemHandler, index);
         this.maxStackSizer = maxStackSizer;

diff --git a/src/main/java/gregtech/common/covers/CoverBehaviors.java b/src/main/java/gregtech/common/covers/CoverBehaviors.java
@@ -8,10 +8,6 @@
 import gregtech.api.util.GTLog;
 import gregtech.client.renderer.texture.Textures;
 import gregtech.common.covers.detector.*;
-import gregtech.common.covers.filter.OreDictionaryItemFilter;
-import gregtech.common.covers.filter.SimpleFluidFilter;
-import gregtech.common.covers.filter.SimpleItemFilter;
-import gregtech.common.covers.filter.SmartItemFilter;
 import gregtech.common.items.MetaItems;
 import gregtech.common.items.behaviors.CoverDigitalInterfaceWirelessPlaceBehaviour;
 

diff --git a/src/main/java/gregtech/common/covers/CoverConveyor.java b/src/main/java/gregtech/common/covers/CoverConveyor.java
@@ -204,7 +204,7 @@ protected int doTransferItemsByGroup(IItemHandler itemHandler, IItemHandler myIt
     }
 
     protected Map<Integer, GroupItemInfo> doCountDestinationInventoryItemsByMatchIndex(IItemHandler itemHandler,
-                                                                                      IItemHandler myItemHandler) {
+                                                                                       IItemHandler myItemHandler) {
         if (conveyorMode == ConveyorMode.IMPORT) {
             return countInventoryItemsByMatchSlot(myItemHandler);
         } else if (conveyorMode == ConveyorMode.EXPORT) {
@@ -409,7 +409,8 @@ protected Map<ItemStack, TypeItemInfo> countInventoryItemsByType(@NotNull IItemH
             if (!matchResult.isMatched()) continue;
 
             if (!result.containsKey(itemStack)) {
-                TypeItemInfo itemInfo = new TypeItemInfo(itemStack.copy(), matchResult.getFilterIndex(), new IntArrayList(), 0);
+                TypeItemInfo itemInfo = new TypeItemInfo(itemStack.copy(), matchResult.getFilterIndex(),
+                        new IntArrayList(), 0);
                 itemInfo.totalCount += itemStack.getCount();
                 itemInfo.slots.add(srcIndex);
                 result.put(itemStack.copy(), itemInfo);
@@ -515,7 +516,7 @@ public boolean usesMui2() {
 
     @Override
     public ModularPanel buildUI(SidedPosGuiData guiData, GuiSyncManager guiSyncManager) {
-        var panel = GTGuis.createPanel(this, 176,192);
+        var panel = GTGuis.createPanel(this, 176, 192);
 
         getItemFilterContainer().setMaxTransferSize(getMaxStackSize());
 
@@ -537,7 +538,8 @@ protected ParentWidget<Column> createUI(ModularPanel mainPanel, GuiSyncManager g
         IntSyncValue throughput = new IntSyncValue(this::getTransferRate, this::setTransferRate);
         throughput.updateCacheFromSource(true);
 
-        StringSyncValue formattedThroughput = new StringSyncValue(throughput::getStringValue, throughput::setStringValue);
+        StringSyncValue formattedThroughput = new StringSyncValue(throughput::getStringValue,
+                throughput::setStringValue);
 
         guiSyncManager.syncValue("manual_io", manualIOmode);
         guiSyncManager.syncValue("conveyor_mode", conveyorMode);
@@ -571,7 +573,6 @@ protected ParentWidget<Column> createUI(ModularPanel mainPanel, GuiSyncManager g
                             })
                             .onUpdateListener(w -> w.overlay(createAdjustOverlay(true)))));
 
-
         if (createFilterRow())
             column.child(getItemFilterContainer().initUI(mainPanel, guiSyncManager));
 
@@ -590,7 +591,6 @@ protected ParentWidget<Column> createUI(ModularPanel mainPanel, GuiSyncManager g
                     .build());
 
         return column;
-
     }
 
     protected boolean createThroughputRow() {

diff --git a/src/main/java/gregtech/common/covers/CoverEnderFluidLink.java b/src/main/java/gregtech/common/covers/CoverEnderFluidLink.java
@@ -1,13 +1,5 @@
 package gregtech.common.covers;
 
-import com.cleanroommc.modularui.api.drawable.IKey;
-import com.cleanroommc.modularui.drawable.DynamicDrawable;
-import com.cleanroommc.modularui.utils.Color;
-import com.cleanroommc.modularui.value.sync.EnumSyncValue;
-import com.cleanroommc.modularui.value.sync.FluidSlotSyncHandler;
-import com.cleanroommc.modularui.widgets.FluidSlot;
-import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
-
 import gregtech.api.capability.GregtechTileCapabilities;
 import gregtech.api.capability.IControllable;
 import gregtech.api.cover.CoverBase;
@@ -43,15 +35,22 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.api.drawable.IKey;
+import com.cleanroommc.modularui.drawable.DynamicDrawable;
 import com.cleanroommc.modularui.drawable.Rectangle;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.utils.Color;
 import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
+import com.cleanroommc.modularui.value.sync.EnumSyncValue;
+import com.cleanroommc.modularui.value.sync.FluidSlotSyncHandler;
 import com.cleanroommc.modularui.value.sync.GuiSyncManager;
 import com.cleanroommc.modularui.value.sync.StringSyncValue;
+import com.cleanroommc.modularui.widgets.FluidSlot;
 import com.cleanroommc.modularui.widgets.ToggleButton;
 import com.cleanroommc.modularui.widgets.layout.Column;
 import com.cleanroommc.modularui.widgets.layout.Row;
+import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -168,9 +167,10 @@ public void openUI(EntityPlayerMP player) {
     public ModularUI createUI(EntityPlayer player) {
         gregtech.api.gui.widgets.WidgetGroup widgetGroup = new gregtech.api.gui.widgets.WidgetGroup();
         widgetGroup.addWidget(new gregtech.api.gui.widgets.LabelWidget(10, 5, "cover.ender_fluid_link.title"));
-        widgetGroup.addWidget(new gregtech.api.gui.widgets.ToggleButtonWidget(12, 18, 18, 18, GuiTextures.BUTTON_PUBLIC_PRIVATE,
-                this::isPrivate, this::setPrivate)
-                        .setTooltipText("cover.ender_fluid_link.private.tooltip"));
+        widgetGroup.addWidget(
+                new gregtech.api.gui.widgets.ToggleButtonWidget(12, 18, 18, 18, GuiTextures.BUTTON_PUBLIC_PRIVATE,
+                        this::isPrivate, this::setPrivate)
+                                .setTooltipText("cover.ender_fluid_link.private.tooltip"));
         widgetGroup.addWidget(new gregtech.api.gui.widgets.SyncableColorRectWidget(35, 18, 18, 18, () -> color)
                 .setBorderWidth(1)
                 .drawCheckerboard(4, 4));
@@ -204,7 +204,7 @@ public boolean usesMui2() {
 
     @Override
     public ModularPanel buildUI(SidedPosGuiData guiData, GuiSyncManager guiSyncManager) {
-        var panel = GTGuis.createPanel(this, 176,192);
+        var panel = GTGuis.createPanel(this, 176, 192);
 
         getFluidFilterContainer().setMaxTransferSize(1000);
         getFluidFilterContainer().setBucketOnly(true);
@@ -236,19 +236,17 @@ protected Column createWidgets(ModularPanel panel, GuiSyncManager syncManager) {
                         .coverChildrenHeight()
                         .child(new ToggleButton()
                                 .tooltip(tooltip -> tooltip.setAutoUpdate(true))
-                                .tooltipBuilder(tooltip ->
-                                        tooltip.addLine(IKey.lang(this.isPrivate ?
-                                                "cover.ender_fluid_link.private.tooltip.enabled" :
-                                                "cover.ender_fluid_link.private.tooltip.disabled")))
+                                .tooltipBuilder(tooltip -> tooltip.addLine(IKey.lang(this.isPrivate ?
+                                        "cover.ender_fluid_link.private.tooltip.enabled" :
+                                        "cover.ender_fluid_link.private.tooltip.disabled")))
                                 .marginRight(2)
                                 .value(isPrivate))
-                        .child(new DynamicDrawable(() ->
-                                new Rectangle()
-                                        .setColor(this.color)
-                                        .asIcon().size(16))
-                                .asWidget()
-                                .background(GTGuiTextures.SLOT)
-                                .size(18).marginRight(2))
+                        .child(new DynamicDrawable(() -> new Rectangle()
+                                .setColor(this.color)
+                                .asIcon().size(16))
+                                        .asWidget()
+                                        .background(GTGuiTextures.SLOT)
+                                        .size(18).marginRight(2))
                         .child(new TextFieldWidget().height(18)
                                 .value(color)
                                 .setValidator(s -> {
@@ -266,8 +264,8 @@ protected Column createWidgets(ModularPanel panel, GuiSyncManager syncManager) {
                         .child(new ToggleButton()
                                 .value(ioEnabled)
                                 .overlay(IKey.dynamic(() -> IKey.lang(this.ioEnabled ?
-                                                "behaviour.soft_hammer.enabled" :
-                                                "behaviour.soft_hammer.disabled").get())
+                                        "behaviour.soft_hammer.enabled" :
+                                        "behaviour.soft_hammer.disabled").get())
                                         .color(Color.WHITE.darker(1)))
                                 .widthRel(0.6f)
                                 .left(0)))

diff --git a/src/main/java/gregtech/common/covers/CoverFluidFilter.java b/src/main/java/gregtech/common/covers/CoverFluidFilter.java
@@ -1,12 +1,5 @@
 package gregtech.common.covers;
 
-import com.cleanroommc.modularui.drawable.Rectangle;
-
-import com.cleanroommc.modularui.utils.Alignment;
-import com.cleanroommc.modularui.value.sync.EnumSyncValue;
-
-import com.cleanroommc.modularui.widgets.layout.Column;
-
 import gregtech.api.capability.impl.FluidHandlerDelegate;
 import gregtech.api.cover.CoverBase;
 import gregtech.api.cover.CoverDefinition;
@@ -42,10 +35,14 @@
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Cuboid6;
 import codechicken.lib.vec.Matrix4;
+import com.cleanroommc.modularui.drawable.Rectangle;
 import com.cleanroommc.modularui.factory.SidedPosGuiData;
 import com.cleanroommc.modularui.screen.ModularPanel;
+import com.cleanroommc.modularui.utils.Alignment;
+import com.cleanroommc.modularui.value.sync.EnumSyncValue;
 import com.cleanroommc.modularui.value.sync.GuiSyncManager;
 import com.cleanroommc.modularui.widgets.SlotGroupWidget;
+import com.cleanroommc.modularui.widgets.layout.Column;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.Unmodifiable;
@@ -100,7 +97,8 @@ public void writeInitialSyncData(@NotNull PacketBuffer packetBuffer) {
     public void readInitialSyncData(@NotNull PacketBuffer packetBuffer) {
         if (packetBuffer.readBoolean()) {
             try {
-                this.fluidFilterContainer.setFilter(FilterTypeRegistry.getFluidFilterForStack(packetBuffer.readItemStack()));
+                this.fluidFilterContainer
+                        .setFilter(FilterTypeRegistry.getFluidFilterForStack(packetBuffer.readItemStack()));
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -163,7 +161,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, GuiSyncManager guiSyncManag
                         .child(new EnumRowBuilder<>(FluidFilterMode.class)
                                 .value(filteringMode)
                                 .lang("Filter Mode")
-//                                .overlay() todo fluid filter overlays
+                                // .overlay() todo fluid filter overlays
                                 .build())
                         .child(new Rectangle().setColor(UI_TEXT_COLOR).asWidget()
                                 .height(1).widthRel(0.95f).margin(0, 4))
@@ -200,9 +198,9 @@ public <T> T getCapability(@NotNull Capability<T> capability, @Nullable T defaul
     public void writeToNBT(@NotNull NBTTagCompound tagCompound) {
         super.writeToNBT(tagCompound);
         tagCompound.setInteger("FilterMode", this.filterMode.ordinal());
-//        tagCompound.setBoolean("IsBlacklist", this.fluidFilter.isBlacklistFilter());
-//        NBTTagCompound filterComponent = new NBTTagCompound();
-//        this.fluidFilter.getFluidFilter().writeToNBT(filterComponent);
+        // tagCompound.setBoolean("IsBlacklist", this.fluidFilter.isBlacklistFilter());
+        // NBTTagCompound filterComponent = new NBTTagCompound();
+        // this.fluidFilter.getFluidFilter().writeToNBT(filterComponent);
         tagCompound.setTag("Filter", getFluidFilter().getContainerStack().serializeNBT());
     }