Oredict compat

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.20-GTNH:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.7.0:dev")
+    compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.10-GTNH:dev")
+
+    implementation("com.github.GTNewHorizons:ModularUI2:2.3.5-1.7.10:dev")
+    implementation("com.github.GTNewHorizons:StructureLib:1.4.23:dev")
+    implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.65: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.2-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.44")
 }

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

@@ -4,15 +4,22 @@
 
 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";
+    private static final String CONFIG_CATEGORY_DEVELOPER = "Developer Settings";
 
     public static String data_dir = "vendingmachine";
     public static String config_dir = "config/vendingmachine";
     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 boolean forceRewriteDatabase = false;
 
     public static File worldDir = null;
 
@@ -37,6 +44,34 @@ public static void init(File configFile) {
             Integer.MAX_VALUE,
             "Number of items per dispense cycle");
 
+        configuration.addCustomCategoryComment(CONFIG_CATEGORY_DEVELOPER, "Developer Settings");
+        forceRewriteDatabase = configuration.getBoolean(
+            "force_rewrite_database",
+            CONFIG_CATEGORY_DEVELOPER,
+            forceRewriteDatabase,
+            "Force rewrite database on load, for add/remove trades or change of format");
+
+        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/VendingMachine.java

@@ -4,9 +4,11 @@
 import org.apache.logging.log4j.Logger;
 
 import com.cubefury.vendingmachine.gui.WidgetThemes;
+import com.cubefury.vendingmachine.handlers.SaveLoadHandler;
 import com.cubefury.vendingmachine.items.VMItems;
 import com.cubefury.vendingmachine.network.PacketTypeRegistry;
 import com.cubefury.vendingmachine.network.SerializedPacket;
+import com.cubefury.vendingmachine.storage.NameCache;
 import com.cubefury.vendingmachine.util.ItemPlaceholder;
 
 import cpw.mods.fml.common.Loader;
@@ -19,6 +21,7 @@
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.event.FMLServerStoppedEvent;
+import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -62,13 +65,13 @@ public void preInit(FMLPreInitializationEvent event) {
         proxy.registerHandlers();
         PacketTypeRegistry.INSTANCE.init();
 
+        // MUI2
+        WidgetThemes.init();
+
         // Register network handlers
         network.registerMessage(SerializedPacket.HandleClient.class, SerializedPacket.class, 0, Side.CLIENT);
         network.registerMessage(SerializedPacket.HandleServer.class, SerializedPacket.class, 0, Side.SERVER);
 
-        // ModularUI
-        WidgetThemes.register();
-
     }
 
     @Mod.EventHandler
@@ -105,6 +108,11 @@ public void serverStarting(FMLServerStartingEvent event) {
         proxy.serverStarting(event);
     }
 
+    @Mod.EventHandler
+    public void serverStopping(FMLServerStoppingEvent event) {
+        SaveLoadHandler.INSTANCE.writeTradeState(NameCache.INSTANCE.getAllUUIDS());
+    }
+
     @Mod.EventHandler
     public void serverStop(FMLServerStoppedEvent event) {}
 

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_INACTIVE = new CustomIcon("vendingmachine:vending_uplink_machine_overlay_inactive"),
+        VUPLINK_OVERLAY_ACTIVE = 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/api/storage/INameCache.java

@@ -20,6 +20,8 @@ public interface INameCache {
 
     List<String> getAllNames();
 
+    List<UUID> getAllUUIDS();
+
     /**
      * Used primarily to know if a user is an OP client side<br>
      */