GT Integration and UI Fixes

dependencies.gradle

@@ -34,10 +34,13 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.77-GTNH:dev")
+    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.16-1.7.10: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")
 }
 
 // deps may transitively add Baubles, so we replace it

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

@@ -1,8 +1,9 @@
 package com.cubefury.vendingmachine;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.MinecraftForge;
 
-import com.cubefury.vendingmachine.integration.nei.IMCforNEI;
+import com.cubefury.vendingmachine.integration.nei.NEIConfig;
 
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -13,14 +14,13 @@ public class ClientProxy extends CommonProxy {
     @Override
     public void preInit(FMLPreInitializationEvent event) {
         super.preInit(event);
-
-        IMCforNEI.IMCSender();
     }
 
     // Override CommonProxy methods here, if you want a different behaviour on the client (e.g. registering renders).
     // Don't forget to call the super methods as well.
     @Override
     public void init(FMLInitializationEvent event) {
+        MinecraftForge.EVENT_BUS.register(new NEIConfig());
         super.init(event);
     }
 

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

@@ -6,11 +6,13 @@
 
 public class Config {
 
-    private static final String CONFIG_CATEGORY_GUI = "GUI";
+    private static final String CONFIG_CATEGORY_VM = "Vending Machine Settings";
 
     public static String data_dir = "vendingmachine";
     public static String config_dir = "config/vendingmachine";
-    public static int gui_refresh_interval = 1;
+    public static int gui_refresh_interval = 20;
+    public static int dispense_frequency = 10;
+    public static int dispense_amount = 16;
 
     public static File worldDir = null;
 
@@ -22,9 +24,18 @@ public static void init(File configFile) {
         config_dir = configuration
             .getString("config_dir", Configuration.CATEGORY_GENERAL, config_dir, "Configuration directory");
 
-        configuration.addCustomCategoryComment(CONFIG_CATEGORY_GUI, "GUI Settings");
+        configuration.addCustomCategoryComment(CONFIG_CATEGORY_VM, "Vending Machine Settings");
         gui_refresh_interval = configuration
-            .getInt("gui_refresh_interval", CONFIG_CATEGORY_GUI, gui_refresh_interval, 1, 3600, "");
+            .getInt("gui_refresh_interval", CONFIG_CATEGORY_VM, gui_refresh_interval, 20, 3600, "In number of ticks");
+        dispense_frequency = configuration
+            .getInt("dispense_frequency", CONFIG_CATEGORY_VM, dispense_frequency, 1, 9000, "In number of ticks");
+        dispense_amount = configuration.getInt(
+            "dispense_amount",
+            CONFIG_CATEGORY_VM,
+            dispense_amount,
+            1,
+            Integer.MAX_VALUE,
+            "Number of items per dispense cycle");
 
         if (configuration.hasChanged()) {
             configuration.save();

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

@@ -1,13 +1,10 @@
 package com.cubefury.vendingmachine;
 
-import net.minecraft.block.Block;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.cubefury.vendingmachine.blocks.BlockVendingMachine;
-import com.cubefury.vendingmachine.blocks.ItemBlockVendingMachine;
-import com.cubefury.vendingmachine.blocks.TileVendingMachine;
+import com.cubefury.vendingmachine.gui.WidgetThemes;
+import com.cubefury.vendingmachine.items.VMItems;
 import com.cubefury.vendingmachine.network.PacketTypeRegistry;
 import com.cubefury.vendingmachine.network.SerializedPacket;
 import com.cubefury.vendingmachine.util.ItemPlaceholder;
@@ -43,10 +40,12 @@ public class VendingMachine {
     @Mod.Instance(MODID)
     public static VendingMachine instance;
 
-    public static Block vendingMachine = new BlockVendingMachine();
-
-    public static boolean isNeiLoaded = false;
     public static boolean isBqLoaded = false;
+    public static boolean isGtLoaded = false;
+    public static boolean isAeLoaded = false;
+
+    public static int CONTROLLER_MTE_ID = 2741;
+    // public static int ME_UPLINK_MTE_ID = 2742;
 
     @SidedProxy(
         clientSide = "com.cubefury.vendingmachine.ClientProxy",
@@ -67,28 +66,35 @@ public void preInit(FMLPreInitializationEvent event) {
         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
     // load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed)
     public void init(FMLInitializationEvent event) {
-        proxy.init(event);
 
-        GameRegistry.registerBlock(vendingMachine, ItemBlockVendingMachine.class, "vending_machine");
-        GameRegistry.registerTileEntity(TileVendingMachine.class, "vending_machine");
+        isBqLoaded = Loader.isModLoaded("betterquesting");
+        isGtLoaded = Loader.isModLoaded("gregtech");
+        isAeLoaded = Loader.isModLoaded("appliedenergistics2");
+
+        LOG.info("Better Questing Integration enabled: {}", isBqLoaded);
+        LOG.info("Gregtech Integration enabled: {}", isGtLoaded);
+        LOG.info("AE2 Integration enabled {}", isAeLoaded);
 
         GameRegistry.registerItem(ItemPlaceholder.placeholder, "placeholder");
 
+        if (isGtLoaded) {
+            VMItems.registerMultis();
+        }
+
+        proxy.init(event);
     }
 
     @Mod.EventHandler
     // postInit "Handle interaction with other mods, complete your setup based on this." (Remove if not needed)
     public void postInit(FMLPostInitializationEvent event) {
-        isNeiLoaded = Loader.isModLoaded("NotEnoughItems");
-        isBqLoaded = Loader.isModLoaded("betterquesting");
-
-        LOG.info("NEI Integration enabled: {}", isNeiLoaded);
-        LOG.info("Better Questing Integration enabled: {}", isBqLoaded);
 
         proxy.postInit(event);
     }