Branding fixup.

This commit is contained in:
cpw committed 2018-09-30 14:29:14 -04:00
1 parent 0024d9d283
commit fe12687ec1
7 files changed
+15 -29

No files matched your search

@@ -1277,12 +1277,6 @@ public class ForgeHooks
return false;
}
public static String getServerModName()
{
//TODO: Branding Properties: snooperbranding
return "forge";
}
private static TriConsumer<Block, ToolType, Integer> blockToolSetter;
//Internal use only Modders, this is specifically hidden from you, as you shouldn't be editing other people's blocks.
public static void setBlockToolSetter(TriConsumer<Block, ToolType, Integer> setter)
@@ -51,7 +51,7 @@ public class BrandingControl
}
}
public static List<String> getBrandings(boolean includeMC, boolean reverse)
private static List<String> getBrandings(boolean includeMC, boolean reverse)
{
computeBranding();
if (includeMC) {
@@ -65,13 +65,12 @@ public class BrandingControl
final List<String> brandings = getBrandings(includeMC, reverse);
IntStream.range(0, brandings.size()).boxed().forEachOrdered(idx -> lineConsumer.accept(idx, brandings.get(idx)));
}
private static final List<String> defaultClientBranding = Stream.of("fml", "forge").collect(Collectors.toList());
public static String getClientBranding() {
return String.join(",", defaultClientBranding);
return "forge";
}
public static final List<String> defaultServerBranding = Arrays.asList("fml", "forge");
public static String getServerBranding() {
return String.join(",", defaultServerBranding);
return "forge";
}
}