LiteLoader / LiteLoader · Commits

Commit d725a74049bf4a7cb64ec5955d17009b3b8da150

Authored by Mumfrey
1 parent 83769d6d

correct minecraft version to "1.8" in version data, closes #66

Inline Side-by-side
Showing 3 changed files with 19 additions and 8 deletions
java/common/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
  View file @d725a74
... ... @@ -457,21 +457,18 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
457 457 {
458 458 if (!container.isEnabled(this.environment))
459 459 {
460   - LiteLoaderLogger.info("Container %s is disabled", container.getLocation());
461 460 this.registerDisabledContainer(container, DisabledReason.USER_DISABLED);
462 461 return false;
463 462 }
464 463  
465 464 if (!this.checkDependencies(container))
466 465 {
467   - LiteLoaderLogger.info("Container %s is missing one or more dependencies", container.getLocation());
468 466 this.registerDisabledContainer(container, DisabledReason.MISSING_DEPENDENCY);
469 467 return false;
470 468 }
471 469  
472 470 if (!this.checkAPIRequirements(container))
473 471 {
474   - LiteLoaderLogger.info("Container %s is missing one or more required APIs", container.getLocation());
475 472 this.registerDisabledContainer(container, DisabledReason.MISSING_API);
476 473 return false;
477 474 }
... ... @@ -501,6 +498,8 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
501 498 protected void registerDisabledContainer(LoadableMod<?> container, DisabledReason reason)
502 499 {
503 500 this.checkState(EnumeratorState.DISCOVER, "registerDisabledContainer");
  501 +
  502 + LiteLoaderLogger.info(reason.getMessage(container));
504 503  
505 504 this.enabledContainers.remove(container.getIdentifier());
506 505 this.disabledContainers.put(container.getIdentifier(), new NonMod(container, false));
... ...
java/common/com/mumfrey/liteloader/core/LiteLoaderVersion.java
  View file @d725a74
... ... @@ -38,7 +38,7 @@ public enum LiteLoaderVersion
38 38 MC_1_7_10_R2(29, 1405369406, "1.7.10", "1.7.10_02", "1.7.10"),
39 39 MC_1_7_10_R3(30, 1407687918, "1.7.10", "1.7.10_03", "1.7.10", "1.7.10_03"),
40 40 MC_1_7_10_R4(31, 1412718533, "1.7.10", "1.7.10_04", "1.7.10", "1.7.10_03", "1.7.10_04"),
41   - MC_1_8_0_R0(32, 0, "1.8.0", "1.8.0", "1.8", "1.8.0");
  41 + MC_1_8_0_R0(32, 0, "1.8", "1.8.0", "1.8", "1.8.0");
42 42  
43 43 /**
44 44 * Current loader version
... ...
java/common/com/mumfrey/liteloader/interfaces/LoaderEnumerator.java
  View file @d725a74
... ... @@ -16,10 +16,22 @@ public interface LoaderEnumerator extends ModularEnumerator
16 16 {
17 17 public enum DisabledReason
18 18 {
19   - UNKNOWN,
20   - USER_DISABLED,
21   - MISSING_DEPENDENCY,
22   - MISSING_API
  19 + UNKNOWN("Container %s is could not be loaded for UNKNOWN reason"),
  20 + USER_DISABLED("Container %s is disabled"),
  21 + MISSING_DEPENDENCY("Container %s is missing one or more dependencies"),
  22 + MISSING_API("Container %s is missing one or more required APIs");
  23 +
  24 + private final String message;
  25 +
  26 + private DisabledReason(String message)
  27 + {
  28 + this.message = message;
  29 + }
  30 +
  31 + public String getMessage(LoadableMod<?> container)
  32 + {
  33 + return String.format(this.message, container);
  34 + }
23 35 }
24 36  
25 37 /**
... ...