Readme changes

README.md

@@ -18,7 +18,7 @@ Alpha Testing
 This can be used as a standalone mod with several dependencies. The vending machine block and ME Vending Uplink do not come with default recipes.
 
 ### Required Dependencies:
-- GT5U
+- GT5Unofficial-GTNH (Not compatible with main GT5U branch!)
 - ModularUI 2
 - NotEnoughItems
 - Applied Energistics 2

dependencies.gradle

@@ -34,13 +34,13 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.77-GTNH:dev")
-    implementation("com.github.GTNewHorizons:GTNHLib:0.6.39:dev")
-    compileOnly("com.github.GTNewHorizons:BetterQuesting:3.7.11-GTNH:dev")
-    implementation("com.github.GTNewHorizons:ModularUI2:2.2.18-1.7.10:dev")
-    // implementation("com.github.GTNewHorizons:ModularUI2:99.99:dev")
-    implementation("com.github.GTNewHorizons:StructureLib:1.4.18:dev")
-    implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.440:dev")
+    implementation("com.github.GTNewHorizons:NotEnoughItems:2.8.6-GTNH:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
+    compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.8-GTNH:dev")
+    implementation("com.github.GTNewHorizons:ModularUI2:2.2.20-1.7.10:dev")
+    // implementation("com.github.GTNewHorizons:ModularUI2:2.2.20-1.7.10:dev")
+    implementation("com.github.GTNewHorizons:StructureLib:1.4.23:dev")
+    implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.21:dev")
 }
 
 // deps may transitively add Baubles, so we replace it
@@ -49,7 +49,7 @@ project.getConfigurations()
         final DependencySubstitutions ds = c.getResolutionStrategy()
             .getDependencySubstitution()
         ds.substitute(ds.module("com.github.GTNewHorizons:Baubles"))
-            .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH"))
+            .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.0-GTNH"))
             .withClassifier("dev")
             .because("Baubles-Expanded replaces Baubles")
     })

settings.gradle.kts

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gtnewhorizons.gtnhsettingsconvention") version("1.0.41")
+    id("com.gtnewhorizons.gtnhsettingsconvention") version("1.0.43")
 }

src/main/java/com/cubefury/vendingmachine/Config.java

@@ -4,6 +4,9 @@
 
 import net.minecraftforge.common.config.Configuration;
 
+import com.cubefury.vendingmachine.blocks.gui.MTEVendingMachineGui;
+import com.cubefury.vendingmachine.blocks.gui.TradeItemDisplayWidget.DisplayType;
+
 public class Config {
 
     private static final String CONFIG_CATEGORY_VM = "Vending Machine Settings";
@@ -13,6 +16,8 @@ public class Config {
     public static int gui_refresh_interval = 20;
     public static int dispense_frequency = 10;
     public static int dispense_amount = 16;
+    public static DisplayType display_type = DisplayType.TILE;
+    public static MTEVendingMachineGui.SortMode sort_mode = MTEVendingMachineGui.SortMode.SMART;
 
     public static File worldDir = null;
 
@@ -36,6 +41,26 @@ public static void init(File configFile) {
             1,
             Integer.MAX_VALUE,
             "Number of items per dispense cycle");
+        try {
+            display_type = DisplayType.valueOf(
+                configuration.getString(
+                    "display_type",
+                    CONFIG_CATEGORY_VM,
+                    "TILE",
+                    "Default trade display format, either TILE or LIST. Case sensitive."));
+        } catch (IllegalArgumentException e) {
+            display_type = DisplayType.TILE;
+        }
+        try {
+            sort_mode = MTEVendingMachineGui.SortMode.valueOf(
+                configuration.getString(
+                    "sort_mode",
+                    CONFIG_CATEGORY_VM,
+                    "SMART",
+                    "Default sort mode, either SMART or ALPHABET. Case sensitive."));
+        } catch (IllegalArgumentException e) {
+            sort_mode = MTEVendingMachineGui.SortMode.SMART;
+        }
 
         if (configuration.hasChanged()) {
             configuration.save();

src/main/java/com/cubefury/vendingmachine/api/enums/Textures.java

@@ -18,7 +18,10 @@ public class Textures {
         VM_OVERLAY_ACTIVE_0 = new CustomIcon("vendingmachine:vending_machine_overlay_active_0"),
         VM_OVERLAY_ACTIVE_1 = new CustomIcon("vendingmachine:vending_machine_overlay_active_1"),
         VM_OVERLAY_ACTIVE_2 = new CustomIcon("vendingmachine:vending_machine_overlay_active_2"),
-        VM_OVERLAY_ACTIVE_3 = new CustomIcon("vendingmachine:vending_machine_overlay_active_3");
+        VM_OVERLAY_ACTIVE_3 = new CustomIcon("vendingmachine:vending_machine_overlay_active_3"),
+
+        VUPLINK_OVERLAY_0 = new CustomIcon("vendingmachine:vending_uplink_machine_overlay_inactive"),
+        VUPLINK_OVERLAY_1 = new CustomIcon("vendingmachine:vending_uplink_machine_overlay_active");
 
     public static final IIconContainer[] VM_OVERLAY_ACTIVE = { VM_OVERLAY_ACTIVE_0, VM_OVERLAY_ACTIVE_1,
         VM_OVERLAY_ACTIVE_2, VM_OVERLAY_ACTIVE_3, VM_OVERLAY_4 // bottom right not animated

src/main/java/com/cubefury/vendingmachine/blocks/MTEVendingMachine.java

@@ -5,6 +5,8 @@
 import static com.cubefury.vendingmachine.api.enums.Textures.VM_MACHINE_FRONT_ON_GLOW;
 import static com.cubefury.vendingmachine.api.enums.Textures.VM_OVERLAY;
 import static com.cubefury.vendingmachine.api.enums.Textures.VM_OVERLAY_ACTIVE;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
+import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
 import static gregtech.api.util.GTStructureUtility.ofHatchAdderOptional;
 
 import java.util.ArrayList;
@@ -46,6 +48,7 @@
 import com.cubefury.vendingmachine.trade.TradeRequest;
 import com.cubefury.vendingmachine.util.BigItemStack;
 import com.cubefury.vendingmachine.util.OverlayHelper;
+import com.cubefury.vendingmachine.util.Translator;
 import com.gtnewhorizon.structurelib.StructureLibAPI;
 import com.gtnewhorizon.structurelib.alignment.IAlignment;
 import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits;
@@ -79,12 +82,14 @@ public class MTEVendingMachine extends MTEMultiBlockBase
         .addShape("main", new String[][] { { "cc", "c~", "cc" } })
         .addElement(
             'c',
-            ofHatchAdderOptional(
-                MTEVendingMachine::addUplinkHatch,
-                ((BlockCasings11) GregTechAPI.sBlockCasings11).getTextureIndex(0),
-                1,
-                GregTechAPI.sBlockCasings11,
-                0))
+            ofChain(
+                ofHatchAdderOptional(
+                    MTEVendingMachine::addUplinkHatch,
+                    ((BlockCasings11) GregTechAPI.sBlockCasings11).getTextureIndex(0),
+                    1,
+                    GregTechAPI.sBlockCasings11,
+                    0),
+                ofBlock(GregTechAPI.sBlockCasings11, 0)))
         .build();
 
     private final ArrayList<MTEVendingUplinkHatch> uplinkHatches = new ArrayList<>();
@@ -343,7 +348,7 @@ public boolean getDefaultHasMaintenanceChecks() {
 
     @Override
     public String[] getStructureDescription(ItemStack stackSize) {
-        return getTooltip().getStructureHint();
+        return new String[] { Translator.translate("structure.vendingmachine.hint.1") };
     }
 
     @Override
@@ -359,6 +364,7 @@ protected MultiblockTooltipBuilder getTooltip() {
                 .beginStructureBlock(2, 3, 1, false)
                 .addController("Middle")
                 .addOtherStructurePart("Tin Item Pipe Casings", "Everything except the controller")
+                .addOtherStructurePart("ME Vending Uplink Hatch", "Any Pipe Casing, Optional")
                 .addStructureInfo("Cannot be flipped onto its side")
                 .toolTipFinisher();
         }

src/main/java/com/cubefury/vendingmachine/blocks/MTEVendingUplinkHatch.java

@@ -1,7 +1,7 @@
 package com.cubefury.vendingmachine.blocks;
 
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_FLUID_HATCH;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_INPUT_FLUID_HATCH_ACTIVE;
+import static com.cubefury.vendingmachine.api.enums.Textures.VUPLINK_OVERLAY_0;
+import static com.cubefury.vendingmachine.api.enums.Textures.VUPLINK_OVERLAY_1;
 
 import java.util.EnumSet;
 
@@ -120,12 +120,12 @@ public void securityBreak() {}
 
     @Override
     public ITexture[] getTexturesActive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_ME_INPUT_FLUID_HATCH_ACTIVE) };
+        return new ITexture[] { aBaseTexture, TextureFactory.of(VUPLINK_OVERLAY_1) };
     }
 
     @Override
     public ITexture[] getTexturesInactive(ITexture aBaseTexture) {
-        return new ITexture[] { aBaseTexture, TextureFactory.of(OVERLAY_ME_INPUT_FLUID_HATCH) };
+        return new ITexture[] { aBaseTexture, TextureFactory.of(VUPLINK_OVERLAY_0) };
     }
 
     @Override