Update to new GML group

Author: Matyrobbrt

Forge/build.gradle

@@ -82,8 +82,8 @@ dependencies {
 
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 
-    compileOnly "com.matyrobbrt.gml:gml:${gml_version}"
-    runtimeOnly("com.matyrobbrt.gml:gml:${gml_version}:all") {
+    compileOnly "org.groovymc.gml:gml:${gml_version}"
+    runtimeOnly("org.groovymc.gml:gml:${gml_version}:all") {
         exclude module: 'transform'
     }
 

Forge/src/main/groovy/org/groovymc/cgl/impl/forge/CGLForge.groovy

@@ -5,16 +5,15 @@
 
 package org.groovymc.cgl.impl.forge
 
-import com.matyrobbrt.gml.BaseGMod
-import com.matyrobbrt.gml.GMod
 import groovy.transform.CompileStatic
 import groovy.transform.stc.POJO
 import org.groovymc.cgl.impl.CommonGroovyLibrary
+import org.groovymc.gml.GMod
 import org.jetbrains.annotations.ApiStatus
 
 @POJO
 @CompileStatic
 @GMod(CommonGroovyLibrary.MOD_ID)
 @ApiStatus.Internal
-class CGLForge implements BaseGMod {
+class CGLForge {
 }

Forge/src/main/groovy/org/groovymc/cgl/impl/forge/GMLBusGetter.groovy

@@ -6,11 +6,11 @@
 package org.groovymc.cgl.impl.forge
 
 import com.google.auto.service.AutoService
-import com.matyrobbrt.gml.GModContainer
 import groovy.transform.CompileStatic
 import org.groovymc.cgl.reg.forge.ForgeBusGetter
 import net.minecraftforge.eventbus.api.IEventBus
 import net.minecraftforge.fml.ModContainer
+import org.groovymc.gml.GModContainer
 import org.jetbrains.annotations.ApiStatus
 
 @CompileStatic

Forge/src/test/groovy/cgltest/CGLTestMod.groovy

@@ -5,8 +5,8 @@
 
 package cgltest
 
-import com.matyrobbrt.gml.GMod
 import groovy.transform.CompileStatic
+import org.groovymc.gml.GMod
 
 @GMod('cgltest')
 @CompileStatic

Forge/src/test/groovy/cgltest/CommandTest.groovy

@@ -5,15 +5,15 @@
 
 package cgltest
 
-import com.matyrobbrt.gml.bus.EventBusSubscriber
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.level.Level
 import net.minecraftforge.event.RegisterCommandsEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent
+import net.minecraftforge.fml.common.Mod
 
-@EventBusSubscriber
+@Mod.EventBusSubscriber
 class CommandTest {
     @SubscribeEvent
     static void test(RegisterCommandsEvent event) {

Forge/src/transform/groovy/org/groovymc/cgl/impl/transform/forge/ForgeModClassTransformer.groovy

@@ -6,9 +6,9 @@
 package org.groovymc.cgl.impl.transform.forge
 
 import com.google.auto.service.AutoService
-import com.matyrobbrt.gml.transform.gmods.GModASTTransformer
 import groovy.transform.CompileStatic
 import org.groovymc.cgl.api.transform.util.ModClassTransformer
+import org.groovymc.gml.transform.gmods.GModASTTransformer
 
 @CompileStatic
 @AutoService(ModClassTransformer.Helper.class)

Forge/src/transform/groovy/org/groovymc/cgl/impl/transform/forge/ForgeModIdRequester.groovy

@@ -6,9 +6,9 @@
 package org.groovymc.cgl.impl.transform.forge
 
 import com.google.auto.service.AutoService
-import com.matyrobbrt.gml.transform.api.ModRegistry
 import groovy.transform.CompileStatic
 import org.groovymc.cgl.api.transform.util.ModIdRequester
+import org.groovymc.gml.transform.api.ModRegistry
 
 @CompileStatic
 @AutoService(ModIdRequester.Helper.class)

gradle.properties

@@ -11,7 +11,7 @@ jankson_version=1.2.2
 
 # Forge
 forge_version=46.0.2
-gml_version=3.1.3
+gml_version=4.0.0-beta
 
 # Quilt
 quilt_loader_version=0.18.5