Show trades which share a cooldown if applicable.

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

README.md

@@ -9,6 +9,20 @@ This mod adds a vending machine, unlocking trades based on questbook data. If yo
 ### Interface
 ![img_1.png](img_1.png)
 
+### Command
+
+**Note: All commands require OP to run**.
+
+If your command still refuses to run, ensure your OP permission level in server.properties is set to 4.
+
+|Task| Command                                           |
+|--|---------------------------------------------------|
+|**Set coin**| `/vending set [player] <coin_type\|all> <amount>` |
+|**Add coin**| `/vending add [player] <coin_type\|all> <amount>` |
+|**Reset coins**| `/vending reset [player] <coin_type\|all>` |
+|**Reload database** | `/vending reload database` |
+|**Reload trade state**| `/vending reload tradestate [player]` |
+
 ## Current Status
 
 Alpha Testing
@@ -18,7 +32,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.60-GTNH:dev")
+    implementation("com.github.GTNewHorizons:GTNHLib:0.9.10:dev")
+    compileOnly("com.github.GTNewHorizons:BetterQuesting:3.8.26-GTNH:dev")
+
+    implementation("com.github.GTNewHorizons:ModularUI2:2.3.39-1.7.10:dev")
+    implementation("com.github.GTNewHorizons:StructureLib:1.4.28:dev")
+    implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.375: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.6-GTNH"))
             .withClassifier("dev")
             .because("Baubles-Expanded replaces Baubles")
     })

gradle.properties

@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -87,7 +111,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -163,6 +189,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.
@@ -192,3 +224,6 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/46949723aaa20c7b64d7ecfed7207034/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

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

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

@@ -2,8 +2,11 @@
 
 import net.minecraftforge.common.MinecraftForge;
 
+import com.cubefury.vendingmachine.handlers.ClientEventHandler;
+import com.cubefury.vendingmachine.handlers.SaveLoadHandler;
 import com.cubefury.vendingmachine.integration.nei.NEIConfig;
 
+import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 
@@ -20,6 +23,7 @@ public void preInit(FMLPreInitializationEvent event) {
     public void init(FMLInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(new NEIConfig());
         super.init(event);
+        SaveLoadHandler.INSTANCE.clientInit();
     }
 
     public boolean isClient() {
@@ -29,6 +33,10 @@ public boolean isClient() {
     @Override
     public void registerHandlers() {
         super.registerHandlers();
+        MinecraftForge.EVENT_BUS.register(ClientEventHandler.INSTANCE);
+        FMLCommonHandler.instance()
+            .bus()
+            .register(ClientEventHandler.INSTANCE);
     }
 
 }

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

@@ -5,6 +5,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.MinecraftForge;
 
+import com.cubefury.vendingmachine.command.CommandVending;
 import com.cubefury.vendingmachine.handlers.EventHandler;
 import com.cubefury.vendingmachine.handlers.SaveLoadHandler;
 
@@ -20,7 +21,6 @@ public class CommonProxy {
     // GameRegistry." (Remove if not needed)
     public void preInit(FMLPreInitializationEvent event) {
         VendingMachine.LOG.info("Loading Vending Machine " + Tags.VERSION);
-        Config.init(event.getSuggestedConfigurationFile());
     }
 
     // load "Do your mod setup. Build whatever data structures you care about. Register recipes." (Remove if not needed)
@@ -35,6 +35,8 @@ public void serverStarting(FMLServerStartingEvent event) {
         ICommandManager command = server.getCommandManager();
         ServerCommandManager manager = (ServerCommandManager) command;
 
+        manager.registerCommand(new CommandVending());
+
         SaveLoadHandler.INSTANCE.init(server);
     }