update for extensions

This commit is contained in:
gnembon committed 2019-07-16 00:15:11 -03:00
1 parent b3fc8de75b
commit dc0dc9e406
4 files changed
+5 -17

No files matched your search

+1 -1
View File
@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.4.8+build.155 loader_version=0.4.8+build.155
# Mod Properties # Mod Properties
mod_version = 1.0.0+v190707 mod_version = 1.0.0+v190714
maven_group = carpet maven_group = carpet
archives_base_name = fabric-carpet archives_base_name = fabric-carpet
@@ -26,7 +26,7 @@ import static carpet.settings.RuleCategory.SURVIVAL;
public class CarpetSettings public class CarpetSettings
{ {
public static final String carpetVersion = "v190707"; public static final String carpetVersion = "v190714";
public static final Logger LOG = LogManager.getLogger(); public static final Logger LOG = LogManager.getLogger();
public static boolean skipGenerationChecks = false; public static boolean skipGenerationChecks = false;
public static boolean impendingFillSkipUpdates = false; public static boolean impendingFillSkipUpdates = false;
+2 -14
View File
@@ -44,12 +44,7 @@ public abstract class Validator<T>
@Override @Override
public T validate(ServerCommandSource source, ParsedRule<T> currentRule, T newValue, String string) public T validate(ServerCommandSource source, ParsedRule<T> currentRule, T newValue, String string)
{ {
if (source != null) Messenger.m(source, "r "+currentRule.name+" is missing a few bits - we are still working on it.");
try
{
Messenger.m(source, "r "+currentRule.name+" is missing a few bits - we are still working on it.");
}
catch (NullPointerException ignored) { }
return newValue; return newValue;
} }
@Override @Override
@@ -62,14 +57,7 @@ public abstract class Validator<T>
{ {
if (!currentRule.options.contains(string.toLowerCase(Locale.ROOT))) if (!currentRule.options.contains(string.toLowerCase(Locale.ROOT)))
{ {
if (source != null) Messenger.m(source, "r Valid options: " + currentRule.options.toString());
try
{
Messenger.m(source, "r Valid options: " + currentRule.options.toString());
}
catch (NullPointerException ignored)
{
}
return null; return null;
} }
return newValue; return newValue;
+1 -1
View File
@@ -220,7 +220,7 @@ public class Messenger
//message source //message source
public static void m(ServerCommandSource source, Object ... fields) public static void m(ServerCommandSource source, Object ... fields)
{ {
source.sendFeedback(Messenger.c(fields),source.getMinecraftServer().getWorld(DimensionType.OVERWORLD).getGameRules() != null); source.sendFeedback(Messenger.c(fields),source.getMinecraftServer().getWorld(DimensionType.OVERWORLD) != null);
} }
public static void m(PlayerEntity player, Object ... fields) public static void m(PlayerEntity player, Object ... fields)
{ {