diff --git a/.gitignore b/.gitignore index cb59d98..d0afd16 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ MinecraftSrc.zip !/mcp918/readme.txt !/mcp918/assetsIndexTransformer.json /rundir/* -/##TEAVM.TMP##/* \ No newline at end of file +/##TEAVM.TMP##/* +/Eaglerforge-Workspace/ \ No newline at end of file diff --git a/patches/minecraft/net/minecraft/client/Minecraft.edit.java b/patches/minecraft/net/minecraft/client/Minecraft.edit.java index 101f648..43ae4e3 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.edit.java +++ b/patches/minecraft/net/minecraft/client/Minecraft.edit.java @@ -20,9 +20,10 @@ > DELETE 1 @ 1 : 4 -> CHANGE 1 : 51 @ 1 : 4 +> CHANGE 1 : 52 @ 1 : 4 ~ +~ import net.eaglerforge.EaglerForge; ~ import net.lax1dude.eaglercraft.v1_8.internal.PlatformInput; ~ ~ import org.apache.commons.lang3.Validate; @@ -189,7 +190,11 @@ > DELETE 2 @ 2 : 3 -> CHANGE 15 : 17 @ 15 : 17 +> INSERT 1 : 2 @ 1 + ++ EaglerForge.init(); + +> CHANGE 14 : 16 @ 14 : 16 ~ try { ~ while (true) { diff --git a/patches/resources/assets/minecraft/lang/en_US.edit.lang b/patches/resources/assets/minecraft/lang/en_US.edit.lang index 1d05c16..550d880 100644 --- a/patches/resources/assets/minecraft/lang/en_US.edit.lang +++ b/patches/resources/assets/minecraft/lang/en_US.edit.lang @@ -27,7 +27,7 @@ + eaglercraft.gui.exitKeyRetarded=Use Backtick (`) to close this screen! + eaglercraft.gui.continue=Continue + -+ eaglercraft.menu.forkOnGitlab=Fork on GitLab ++ eaglercraft.menu.forkOnGitlab=Fork on GitHub + eaglercraft.menu.editProfile=Edit Profile + eaglercraft.menu.openToLan=Invite + eaglercraft.menu.closeLan=Stop Sharing diff --git a/sources/main/java/net/eaglerforge/EaglerForge.java b/sources/main/java/net/eaglerforge/EaglerForge.java new file mode 100644 index 0000000..1347c95 --- /dev/null +++ b/sources/main/java/net/eaglerforge/EaglerForge.java @@ -0,0 +1,13 @@ +package net.eaglerforge; + +import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; +import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + +public class EaglerForge { + public static final Logger log = LogManager.getLogger(); + public static void init() { + log.info("Starting EaglerForge!"); + log.info("Loading Mods..."); + // TODO: Make a javascript moding api using teavm and make the mods load here + } +} diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index f94a58e..0224e10 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -9,11 +9,11 @@ public class EaglercraftVersion { /// Customize these to fit your fork: - public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u22"; - public static final String projectForkVendor = "lax1dude"; + public static final String projectForkName = "EaglerForge"; + public static final String projectForkVersion = "v1"; + public static final String projectForkVendor = "radmanplays"; - public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; + public static final String projectForkURL = "https://github.com/eaglerforge/EaglerForge"; ////////////////////////////////////////////////////////////////////// @@ -47,21 +47,21 @@ public class EaglercraftVersion { // Miscellaneous variables: - public static final String mainMenuStringA = "Minecraft 1.8.8"; + public static final String mainMenuStringA = "Minecraft* 1.8.8"; public static final String mainMenuStringB = projectOriginName + " " + projectOriginRevision + "-" + projectOriginVersion + " ultimate"; public static final String mainMenuStringC = ""; public static final String mainMenuStringD = "Resources Copyright Mojang AB"; public static final String mainMenuStringE = projectForkName + " " + projectForkVersion; - public static final String mainMenuStringF = "Made by " + projectForkVendor; + public static final String mainMenuStringF = "Based on eaglercraft " + projectOriginVersion; public static final String mainMenuStringG = "Collector's Edition"; public static final String mainMenuStringH = "PBR Shaders"; public static final long demoWorldSeed = (long) "North Carolina".hashCode(); - public static final boolean mainMenuEnableGithubButton = false; + public static final boolean mainMenuEnableGithubButton = true; public static final boolean forceDemoMode = false; diff --git a/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties b/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties index 6ce793f..17655d0 100644 --- a/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties +++ b/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists