MC 1.19.x Migration (#2)

* init (unstable)

* init (unstable)

* init

* bumped version

* bumped VR API to version with room data (stable-ish)

* 0.3.0

* 0.3.0 (stable)

refined things, improved config and simple tests, implemented speed and elapsed time

Author: jakeee51

build.gradle

@@ -7,18 +7,24 @@ buildscript {
         classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
     }
 }
-apply plugin: 'net.minecraftforge.gradle'
+
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'
+plugins {
+    //In case people use the inferior IDE
+    id 'eclipse'
+    id 'maven-publish'
+}
 
-version = '0.2.6'
+apply plugin: 'net.minecraftforge.gradle'
+version = '0.3.0'
 group = 'com.calicraft.vrjester' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'VRJesterAPI'
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 project.logger.lifecycle("VRJesterAPI-${project.version}")
 project.logger.lifecycle('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
+
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
     // Channel:   Version:
@@ -31,10 +37,10 @@ minecraft {
     //
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.16.5'
+    mappings channel: 'official', version: '1.19.2'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-    
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
 
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
@@ -54,6 +60,9 @@ minecraft {
             // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
+            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
+            property 'forge.enabledGameTestNamespaces', 'vrjesterapi'
+
             mods {
                 vrjesterapi {
                     source sourceSets.main
@@ -64,18 +73,31 @@ minecraft {
         server {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             property 'forge.logging.markers', 'REGISTRIES'
 
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
+            property 'forge.enabledGameTestNamespaces', 'vrjesterapi'
+
+            mods {
+                vrjesterapi {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        // This run config launches GameTestServer and runs all registered gametests, then exits.
+        // By default, the server will crash when no gametests are provided.
+        // The gametest system is also enabled by default for other run configs under the /test command.
+        gameTestServer {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            property 'forge.logging.console.level', 'debug'
+
+            property 'forge.enabledGameTestNamespaces', 'vrjesterapi'
+
             mods {
                 vrjesterapi {
                     source sourceSets.main
@@ -86,16 +108,8 @@ minecraft {
         data {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
             property 'forge.logging.markers', 'REGISTRIES'
 
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
             property 'forge.logging.console.level', 'debug'
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
@@ -118,39 +132,45 @@ task deobfJar(type: Jar) {
     classifier = 'deobf'
 }
 
+repositories {
+    // Put repositories for dependencies here
+    // ForgeGradle automatically adds the Forge maven and Maven Central for you
+
+    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
+    //    flatDir {
+    //        dir 'lib'
+    //    }
+    maven {
+        url = "https://cursemaven.com"
+    }
+    mavenCentral()
+}
+
 dependencies {
-    implementation 'org.jetbrains:annotations:20.1.0'
 
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.5-36.2.34'
-    implementation files('libs/minecrift-1.16.5-jrbudda-7-6.jar')
-//    implementation files('libs/vivecraft-1.19.2-jrbudda-VR-2-b8-forge.jar')
-    implementation files('libs/OptiFine-1.16.5_HD_U_G8.jar')
-    implementation group: 'org.json', name: 'json', version: '20220320'
-    implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.149'
-    compileOnly group: 'com.mojang', name: 'authlib', version: '1.5.25'
+    minecraft 'net.minecraftforge:forge:1.19.2-43.1.1'
+    compileOnly fg.deobf("curse.maven:mcvrapi-591092:4073384")
+    runtimeOnly fg.deobf("curse.maven:mcvrapi-591092:4073384")
+    implementation 'org.jetbrains:annotations:23.0.0'
+    implementation files('libs/OptiFine_1.19.2_HD_U_H9.jar')
+//    implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.149'
+//    compileOnly group: 'com.mojang', name: 'authlib', version: '1.5.25'
 
 
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
+    // Real mod deobf dependency examples - these get remapped to your current mappings
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
+    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
+    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
 
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // Examples using mod jars from ./libs
+    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
 
     // For more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
@@ -193,3 +213,7 @@ publishing {
         }
     }
 }
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}

forge-1.16.5-36.2.20-mdk.zip

@@ -1,23 +1,19 @@
 package com.calicraft.vrjester;
 
-import com.calicraft.vrjester.handlers.TriggerEventHandler;
-import com.calicraft.vrjester.tracker.PositionTracker;
 import com.calicraft.vrjester.utils.tools.EventsLoader;
-import net.minecraft.block.Block;
-import net.minecraft.block.Blocks;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.InterModComms;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
 import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -28,35 +24,25 @@
 @Mod("vrjester")
 public class VrJesterApi {
     // Main entry point
-    private static final Logger LOGGER = LogManager.getLogger();
-    public static PositionTracker TRACKER;
+    public static final Logger LOGGER = LogManager.getLogger();
     public static boolean VIVECRAFTLOADED = false;
     public static final String MOD_ID = "vrjester";
-    public static final KeyBinding MOD_KEY = new KeyBinding("Jester Trigger", 71, MOD_ID);
+    public static final KeyMapping MOD_KEY = new KeyMapping("key.vrjester.71", 71, MOD_ID);
 
     public VrJesterApi() {
+        IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+
         // Register the setup method for modloading
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
         // Register the enqueueIMC method for modloading
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
         // Register the processIMC method for modloading
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
-        // Register the doClientStuff method for modloading
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff);
+        // Register the registerBindings method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::registerBindings);
         // Register ourselves for server and other game events we are interested in
         MinecraftForge.EVENT_BUS.register(this);
-        // Register deferred register for custom particles
-//        PARTICLES.register(FMLJavaModLoadingContext.get().getModEventBus());
-        try { // Check if Vivecraft is running
-            Class.forName("org.vivecraft.api.VRData");
-            VIVECRAFTLOADED = true;
-            System.out.println("Vivecraft has been loaded!");
-            EventsLoader.register();
-            LOGGER.info("Events have been loaded!");
-        } catch (ClassNotFoundException | NoClassDefFoundError e) {
-            LOGGER.error("Vivecraft has failed to load!");
-        }
-        MinecraftForge.EVENT_BUS.register(new TriggerEventHandler());
+        EventsLoader.register();
     }
 
     public static Minecraft getMCI() {
@@ -65,9 +51,7 @@ public static Minecraft getMCI() {
 
     private void setup(final FMLCommonSetupEvent event) {
         // some preinit code
-        ClientRegistry.registerKeyBinding(MOD_KEY);
         LOGGER.info("HELLO FROM PREINIT");
-        LOGGER.info("DIRT BLOCK >> {}", Blocks.DIRT.getRegistryName());
     }
 
     private void enqueueIMC(final InterModEnqueueEvent event) {
@@ -78,29 +62,37 @@ private void enqueueIMC(final InterModEnqueueEvent event) {
     private void processIMC(final InterModProcessEvent event) {
         // some example code to receive and process InterModComms from other mods
         LOGGER.info("Got IMC {}", event.getIMCStream().
-                map(m->m.getMessageSupplier().get()).
+                map(m->m.messageSupplier().get()).
                 collect(Collectors.toList()));
     }
 
     private void doClientStuff(final FMLClientSetupEvent event) {
         // do something that can only be done on the client
-        LOGGER.info("Got game settings {}", event.getMinecraftSupplier().get().options);
+        LOGGER.info("Do client stuff like get game settings");
     }
+
+    public void registerBindings(RegisterKeyMappingsEvent event) {
+        LOGGER.info("Registering KeyMappings");
+        event.register(MOD_KEY);
+    }
+
     // You can use SubscribeEvent and let the Event Bus discover methods to call
     @SubscribeEvent
-    public void onServerStarting(FMLServerStartingEvent event) {
-        // do something when the server starts
+    public void onServerStarting(ServerStartingEvent event) {
+        // Do something when the server starts
         LOGGER.info("HELLO from server starting");
     }
 
-    // You can use EventBusSubscriber to automatically subscribe events on the contained class
-    // (this is subscribing to the MOD Event bus for receiving Registry Events)
-    @Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
-    public static class RegistryEvents {
+    // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
+    @Mod.EventBusSubscriber(modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
+    public static class ClientModEvents
+    {
         @SubscribeEvent
-        public static void onBlocksRegistry(final RegistryEvent.Register<Block> blockRegistryEvent) {
-            // register a new block here
-            LOGGER.info("HELLO from Register Block");
+        public static void onClientSetup(FMLClientSetupEvent event)
+        {
+            // Some client setup code
+            LOGGER.info("HELLO FROM CLIENT SETUP");
+            LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName());
         }
     }
 }

forge-1.19.2-43.1.1-mdk.zip

@@ -1,25 +1,40 @@
 package com.calicraft.vrjester.config;
 
-import org.json.JSONObject;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.Scanner;
 
 public class Config {
+    public boolean WRITE_DATA = Constants.WRITE_DATA;
+    public boolean DISPLAY_VOX = Constants.DISPLAY_VOX;
+    public float VOX_LENGTH = Constants.VOX_LENGTH;
+    public int VOX_GRID_LENGTH = Constants.VOX_GRID_LENGTH;
+    public int VOX_GRID_WIDTH = Constants.VOX_GRID_WIDTH;
+    public int VOX_GRID_HEIGHT = Constants.VOX_GRID_HEIGHT;
+    public float MAX_LISTENING_TIME = Constants.MAX_LISTENING_TIME;
+    public SimpleGesture[] GESTURES;
+    public Log LOG;
+
+    public class Log {
+        // Class that represents log configuration
+        public String name;
+        public String gesture;
+        public int pose;
+        public String[] devices;
+    }
 
-    public String configPath = Constants.CONFIG_PATH;
-
-    public Config() {}
-
-    public Config(String configPath) {
-        this.configPath = configPath;
+    public class SimpleGesture {
+        // Class that represents a gesture's overall simple attributes from a collection of Trace objects
+        public String name;
+        public String movements;
+        public long elapsedTime;
+        public double velocity;
     }
 
-    public JSONObject readConfig() {
+    public static Config readConfig(String configPath) {
         try {
             StringBuilder sb = new StringBuilder();
             File configFile = new File(configPath);
@@ -30,17 +45,15 @@ public JSONObject readConfig() {
 //                System.out.println("CONFIG: " + data);
             }
             myReader.close();
-            return new JSONObject(sb.toString());
-//            return new JSONObject(Files.readString(Path.of(configPath)));
+            GsonBuilder builder = new GsonBuilder();
+            builder.setPrettyPrinting();
+            Gson gson = builder.create();
+            Config configJson = gson.fromJson(sb.toString(), Config.class);
+            return configJson;
         } catch (FileNotFoundException e) {
-            System.out.println("An error occurred!");
+            System.out.println("An error occurred reading config json!");
             e.printStackTrace();
         }
-//        } catch (IOException e) {
-//            System.out.println("An error occurred!");
-//            e.printStackTrace();
-//        }
-        return new JSONObject();
+        return new Config();
     }
-
 }