Merge LambdaInnovation/AcademyCraft#884,LambdaInnovation/AcademyCraft#848,LambdaInnovation/AcademyCraft#846 and some change

Author: LovelyCane

CHANGELOG.md

@@ -16,4 +16,14 @@
 ## [1.1.5-pre1] - 2024-12-16
 
 ### Changed
-- Fixed some bug.
+- Fixed some bug.
+
+## [1.1.6-pre1] - 2024-12-18
+
+### Changed
+- Idk :)
+
+## [1.1.7-pre1] - 2024-12-18
+
+### Changed
+- Removed some code.

PLAN.md

@@ -0,0 +1,7 @@
+# Plan
+
+## Remove Scala Code
+- The Scala code is extensive and will require some time to remove.
+
+## Replace Lambdalib2 with Better Libraries
+- To facilitate porting to higher versions.

build.gradle

@@ -15,35 +15,9 @@ apply from: 'gradle/scripts/publishing.gradle'
 apply from: 'gradle/scripts/extra.gradle'
 apply from: 'gradle/scripts/dependencies.gradle'
 
-// Early Assertions
-assertProperty 'mod_version'
-assertProperty 'root_package'
-assertProperty 'mod_id'
-assertProperty 'mod_name'
-
-assertSubProperties 'use_tags', 'tag_class_name'
-assertSubProperties 'use_access_transformer', 'access_transformer_locations'
-assertSubProperties 'use_mixins', 'mixin_booter_version', 'mixin_refmap'
-assertSubProperties 'use_asset_mover', 'asset_mover_version'
-
-setDefaultProperty 'use_modern_java_syntax', false, false
-setDefaultProperty 'generate_sources_jar', true, false
-setDefaultProperty 'generate_javadocs_jar', true, false
-setDefaultProperty 'mapping_channel', true, 'stable'
-setDefaultProperty 'mapping_version', true, '39'
-setDefaultProperty 'use_dependency_at_files', true, true
-setDefaultProperty 'minecraft_username', true, 'Developer'
-setDefaultProperty 'extra_jvm_args', false, ''
-setDefaultProperty 'extra_tweak_classes', false, ''
-setDefaultProperty 'change_minecraft_sources', false, false
-
 version = propertyString('mod_version')
 group = propertyString('root_package')
 
-base {
-    archivesName.set(propertyString('mod_id'))
-}
-
 tasks.decompressDecompiledSources.enabled !propertyBool('change_minecraft_sources')
 
 configurations {
@@ -60,9 +34,6 @@ minecraft {
 
     username.set(propertyString('minecraft_username'))
 
-    // Add any additional tweaker classes here
-    extraTweakClasses.addAll(propertyStringList('extra_tweak_classes'))
-
     // Add various JVM arguments here for runtime
     def args = ['-ea:' + group]
     if (propertyBool('use_mixins')) {
@@ -103,10 +74,6 @@ dependencies {
             transitive = false
         }
     }
-    if (propertyBool('enable_junit_testing')) {
-        testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
-        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    }
 }
 
 // Adds Access Transformer files to tasks
@@ -127,8 +94,7 @@ processResources {
     filterList.addAll(propertyStringList('mixin_configs').collect(config -> "mixins.${config}.json" as String))
 
     filesMatching(filterList) { fcd ->
-        fcd.expand(
-                'mod_id': propertyString('mod_id'),
+        fcd.expand('mod_id': propertyString('mod_id'),
                 'mod_name': propertyString('mod_name'),
                 'mod_version': propertyString('mod_version'),
                 'mod_description': propertyString('mod_description'),
@@ -138,8 +104,7 @@ processResources {
                 'mod_update_json': propertyString('mod_update_json'),
                 'mod_logo_path': propertyString('mod_logo_path'),
                 'mixin_refmap': propertyString('mixin_refmap'),
-                'mixin_package': propertyString('mixin_package')
-        )
+                'mixin_package': propertyString('mixin_package'))
     }
 
     if (propertyBool('use_access_transformer')) {
@@ -152,28 +117,8 @@ jar {
     archiveVersion = mod_version + "-Java" + JavaVersion.current().toString()
 
     manifest {
-        attributes(
-                'FMLCorePluginContainsFMLMod': true,
-                'FMLCorePlugin': 'cn.lambdalib2.CorePlugin'
-        )
-    }
-    // Add all embedded dependencies into the jar
-    from(provider { configurations.embed.collect { it.isDirectory() ? it : zipTree(it) } })
-}
-
-compileTestJava {
-    sourceCompatibility = targetCompatibility = 8
-}
-
-test {
-    useJUnitPlatform()
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion = JavaLanguageVersion.of(8)
-    })
-    if (propertyBool('show_testing_output')) {
-        testLogging {
-            showStandardStreams = true
-        }
+        attributes('FMLCorePluginContainsFMLMod': true,
+                'FMLCorePlugin': 'cn.lambdalib2.CorePlugin')
     }
 }
 
@@ -194,12 +139,6 @@ tasks.register('generateMixinJson') {
     }
 }
 
-if (propertyBool('use_modern_java_syntax')) {
-    tasks.withType(Javadoc).configureEach {
-        sourceCompatibility = 21
-    }
-}
-
 tasks.named('injectTags', InjectTagsTask).configure {
     onlyIf {
         return propertyBool('use_tags') && !it.getTags().get().isEmpty()
@@ -221,6 +160,7 @@ tasks.register('prioritizeCoremods') {
         }
     }
 }
+
 tasks.withType(ScalaCompile) {
     options.encoding = 'UTF-8'
 }
@@ -254,9 +194,7 @@ idea {
             compiler.javac {
                 afterEvaluate {
                     javacAdditionalOptions = "-encoding utf8"
-                    moduleJavacAdditionalOptions = [
-                            (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')
-                    ]
+                    moduleJavacAdditionalOptions = [(project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ')]
                 }
             }
         }

gradle.properties

@@ -6,24 +6,19 @@ use_modern_java_syntax=true
 # Compilation Options
 generate_sources_jar=true
 generate_javadocs_jar=false
-# Testing
-enable_junit_testing=true
-show_testing_output=false
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
 root_package=cn.academy
 mod_group=cn.academy
 mod_id=academy
 mod_name=AcademyCraft
-mod_version=1.1.4-pre2
+mod_version=1.1.7-pre1
 # Mod Metadata (Optional)
-mod_description=
-mod_url=
-mod_update_json=
+mod_description=A mod about superability. Become an ESPer and alter your reality in Minecraft!
 # Delimit authors with commas
-mod_authors=
-mod_credits=
-mod_logo_path=
+mod_authors=Lambda Innovation
+mod_credits=All the players of the mod, like you.
+mod_logo_path=logo.png
 # Mapping Properties
 mapping_channel=stable
 mapping_version=39

src/main/java/cn/academy/AcademyCraft.java

@@ -1,6 +1,5 @@
 package cn.academy;
 
-import cn.academy.analytic.AnalyticDataListener;
 import cn.lambdalib2.crafting.RecipeRegistry;
 import cn.lambdalib2.registry.RegistryMod;
 import cn.lambdalib2.registry.StateEventCallback;
@@ -30,14 +29,12 @@ public class AcademyCraft {
     @Instance("academy-craft")
     public static AcademyCraft INSTANCE;
     public static final String VERSION = Tags.VERSION;
-    public static final boolean DEBUG_MODE = VERSION.startsWith("@");
+    public static final boolean DEBUG_MODE = false;
     public static final Logger log = LogManager.getLogger(Tags.MOD_NAME);
 
     public static Configuration config;
     public static RecipeRegistry recipes;
 
-    public static AnalyticDataListener analyticDataListener;
-
     public static CreativeTabs cct = new CreativeTabs("AcademyCraft") {
         @Override
         public ItemStack createIcon() {
@@ -55,10 +52,6 @@ private static void preInit(FMLPreInitializationEvent event) {
 
         config = new Configuration(event.getSuggestedConfigurationFile());
         config.load();
-
-        if (config.getBoolean("analysis", "generic", true, "switch for analytic system")) {
-            AnalyticDataListener analyticDataListener = AnalyticDataListener.instance;
-        }
     }
 
     @EventHandler

src/main/java/cn/academy/ability/context/Context.java

@@ -1,52 +1,51 @@
 package cn.academy.ability.context;
 
+import cn.academy.AcademyCraft;
 import cn.academy.ability.AbilityContext;
 import cn.academy.ability.Skill;
-import cn.academy.AcademyCraft;
 import cn.lambdalib2.s11n.network.NetworkMessage;
 import cn.lambdalib2.s11n.network.NetworkMessage.IMessageDelegate;
 import cn.lambdalib2.util.Debug;
-import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
 /**
  * {@link Context} represents an environment that is bound to a specific player. When a context is activated
- *  via {@link ContextManager#activate(Context)}, a connection of same context is established in server and clients
- *  near the context, making one able to channel messages inside same context through many different sides.
+ * via {@link ContextManager#activate(Context)}, a connection of same context is established in server and clients
+ * near the context, making one able to channel messages inside same context through many different sides.
  * <p>
- *     The logic is built upon LambdaLib's NetworkMessage, so the serialization logic is almost the same, except for
- *  Context handles player connections and remote-side creation for you.
+ * The logic is built upon LambdaLib's NetworkMessage, so the serialization logic is almost the same, except for
+ * Context handles player connections and remote-side creation for you.
  * </p>
  *
+ * @author WeAthFolD
  * @see cn.lambdalib2.s11n.network.NetworkMessage
  * @see ContextManager
- * @author WeAthFolD
  */
-public class Context<TSkill extends Skill> implements IMessageDelegate {
 
+public class Context<TSkill extends Skill> implements IMessageDelegate {
     // Turn this on if you want to debug context message detail
     public static final boolean DEBUG_MSG = false;
 
     public static final String
-        MSG_TERMINATED = "i_term",
-        MSG_MADEALIVE = "i_alive",
-        MSG_TICK = "i_tick";
+            MSG_TERMINATED = "i_term",
+            MSG_MADEALIVE = "i_alive",
+            MSG_TICK = "i_tick";
 
     // Key messages for single key context.
     public static final String MSG_KEYDOWN = "keydown";
     public static final String MSG_KEYTICK = "keytick";
     public static final String MSG_KEYUP = "keyup";
     public static final String MSG_KEYABORT = "keyabort";
 
-    public enum Status { CONSTRUCTED, ALIVE, TERMINATED }
+    public enum Status {CONSTRUCTED, ALIVE, TERMINATED}
 
     private final ContextManager mgr = ContextManager.instance;
 
@@ -130,39 +129,37 @@ public double getRange() {
         return 50.0;
     }
 
-    public void sendToServer(String channel, Object ...args) {
+    public void sendToServer(String channel, Object... args) {
         messageDebug("ToServer: " + channel);
         mgr.mToServer(this, channel, args);
     }
 
-    public void sendToClient(String channel, Object ...args) {
+    public void sendToClient(String channel, Object... args) {
         messageDebug("ToClient: " + channel);
         mgr.mToClient(this, channel, args);
     }
 
-    public void sendToLocal(String channel, Object ...args) {
+    public void sendToLocal(String channel, Object... args) {
         messageDebug("ToLocal: " + channel);
         mgr.mToLocal(this, channel, args);
     }
 
-    public void sendToExceptLocal(String channel, Object ...args) {
+    public void sendToExceptLocal(String channel, Object... args) {
         messageDebug("ToExceptLocal: " + channel);
         mgr.mToExceptLocal(this, channel, args);
     }
 
-    public void sendToSelf(String channel, Object ...args) {
+    public void sendToSelf(String channel, Object... args) {
         messageDebug("ToSelf: " + channel);
         mgr.mToSelf(this, channel, args);
     }
 
     private void messageDebug(String s) {
         if (AcademyCraft.DEBUG_MODE && DEBUG_MSG) {
-            Debug.log("[Context]" + (isRemote() ? "[C] " : "[S] " ) +getClass().getSimpleName() + ": " + s);
+            Debug.log("[Context]" + (isRemote() ? "[C] " : "[S] ") + getClass().getSimpleName() + ": " + s);
         }
     }
 
-    //
-
     // Sugar
 
     @SideOnly(Side.CLIENT)

src/main/java/cn/academy/ability/context/ContextManager.java

@@ -2,7 +2,6 @@
 
 import cn.academy.AcademyCraft;
 import cn.academy.ability.context.Context.Status;
-import cn.academy.analytic.events.AnalyticSkillEvent;
 import cn.academy.event.ability.CategoryChangeEvent;
 import cn.academy.event.ability.OverloadEvent;
 import cn.lambdalib2.s11n.network.NetworkMessage;
@@ -426,7 +425,6 @@ private void hBeginLink(Object typein, EntityPlayerMP player, int clientID) {
                 NetworkMessage.sendTo(player, LocalManager.instance, M_ESTABLISH_LINK, clientID, nextServerID);
                 NetworkMessage.sendToPlayers(data.targets, ClientManager.instance, M_MAKEALIVE,
                         writeContextType(ctx.getClass()), player, nextServerID);
-                MinecraftForge.EVENT_BUS.post(new AnalyticSkillEvent(data.ctx.player,data.ctx.skill));
                 nextServerID += 1;
 
                 log("[SVR] BeginLink");