diff --git a/build.gradle b/build.gradle index 43c77b50..752330ff 100644 --- a/build.gradle +++ b/build.gradle @@ -100,7 +100,8 @@ jar { manifest.attributes( "TweakClass": "org.spongepowered.asm.launch.MixinTweaker", "MixinConfigs": "mixins.vanillafix.json", - "FMLCorePlugin": "org.dimdev.vanillafix.VanillaFixCoreMod" + "FMLCorePlugin": "org.dimdev.vanillafix.VanillaFixCoreMod", + "ForceLoadAsMod": "true" ) } diff --git a/src/main/java/org/dimdev/vanillafix/GuiCrashScreen.java b/src/main/java/org/dimdev/vanillafix/GuiCrashScreen.java index 7721c2ba..f3a19d23 100644 --- a/src/main/java/org/dimdev/vanillafix/GuiCrashScreen.java +++ b/src/main/java/org/dimdev/vanillafix/GuiCrashScreen.java @@ -1,6 +1,5 @@ package org.dimdev.vanillafix; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.*; import net.minecraft.client.resources.I18n; import net.minecraft.crash.CrashReport; @@ -11,7 +10,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.dimdev.ddutils.HasteUpload; import org.dimdev.vanillafix.mixins.client.IFixedMinecraft; -import org.dimdev.vanillafix.mixins.client.MixinMinecraft; import java.io.File; import java.net.URI; @@ -34,7 +32,7 @@ public class GuiCrashScreen extends GuiScreen { public void initGui() { buttonList.clear(); buttonList.add(new GuiOptionButton(0, width / 2 - 155, height / 4 + 120 + 12, I18n.format("gui.toTitle"))); - buttonList.add(new GuiOptionButton(1, width / 2 - 155 + 160, height / 4 + 120 + 12, I18n.format("vanillafix.gui.getLink"))); + buttonList.add(new GuiOptionButton(1, width / 2 - 155 + 160, height / 4 + 120 + 12, "Get Link")); // TODO: localize } @Override @@ -51,7 +49,9 @@ public class GuiCrashScreen extends GuiScreen { mc.displayGuiScreen(new GuiConfirmOpenLink(this, hasteLink, 31102009, false)); } } catch (Throwable e) { - log.error(e); + log.error("Exception when crash menu button clicked:", e); + button.displayString = "[Failed]"; + button.enabled = false; } } diff --git a/src/main/java/org/dimdev/vanillafix/VanillaFixCoreContainer.java b/src/main/java/org/dimdev/vanillafix/VanillaFixCoreContainer.java index 1c4adebb..192444f6 100644 --- a/src/main/java/org/dimdev/vanillafix/VanillaFixCoreContainer.java +++ b/src/main/java/org/dimdev/vanillafix/VanillaFixCoreContainer.java @@ -12,7 +12,7 @@ public class VanillaFixCoreContainer extends DummyModContainer { public VanillaFixCoreContainer() { super(new ModMetadata()); ModMetadata meta = getMetadata(); - meta.modId = "cubicchunkscore"; + meta.modId = "vanillafix"; meta.name = "VanillaFix"; meta.version = "${version}"; } @@ -21,4 +21,4 @@ public class VanillaFixCoreContainer extends DummyModContainer { public List getDependencies() { return Collections.emptyList(); } -} \ No newline at end of file +} diff --git a/src/main/resources/assets/dimdoors/lang/en_US.lang b/src/main/resources/assets/dimdoors/lang/en_US.lang index 9bf90e56..d0538159 100644 --- a/src/main/resources/assets/dimdoors/lang/en_US.lang +++ b/src/main/resources/assets/dimdoors/lang/en_US.lang @@ -201,5 +201,3 @@ dimdoors.graphics.riftSize=Rift Size dimdoors.graphics.riftSize.tooltip=Multiplier affecting how large rifts should be rendered, 1 being the default size. dimdoors.graphics.riftJitter=Rift Jitter dimdoors.graphics.riftJitter.tooltip=Multiplier affecting how much rifts should jitter, 1 being the default size. - -vanillafix.gui.getLink=Get Link