mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
Update to 1.18.2
Co-authored-by: sciwhiz12 <[email protected]> Co-authored-by: Marc Hermans <[email protected]> Co-authored-by: LexManos <[email protected]> Co-authored-by: Curle <[email protected]> Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
1 parent
34291c1fb2
commit
425eff39ff
234 files changed
+2175
-3226
No files matched your search
@@ -67,7 +67,7 @@ public class LanguageHook
|
||||
|
||||
private static void loadLanguage(String langName, MinecraftServer server) {
|
||||
String langFile = String.format(Locale.ROOT, "lang/%s.json", langName);
|
||||
ResourceManager resourceManager = server.getServerResources().getResourceManager();
|
||||
ResourceManager resourceManager = server.getServerResources().resourceManager();
|
||||
resourceManager.getNamespaces().forEach(namespace -> {
|
||||
try {
|
||||
ResourceLocation langResource = new ResourceLocation(namespace, langFile);
|
||||
|
||||
@@ -95,7 +95,7 @@ public final class PermissionAPI
|
||||
*/
|
||||
public static void initializePermissionAPI()
|
||||
{
|
||||
Class callerClass = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass();
|
||||
Class<?> callerClass = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).getCallerClass();
|
||||
if (callerClass != ServerLifecycleHooks.class)
|
||||
{
|
||||
LOGGER.warn("{} tried to initialize the PermissionAPI, this call will be ignored.", callerClass.getName());
|
||||
|
||||
+3
-3
@@ -11,15 +11,15 @@ import java.util.Locale;
|
||||
|
||||
public class UnregisteredPermissionException extends RuntimeException
|
||||
{
|
||||
private PermissionNode node;
|
||||
private PermissionNode<?> node;
|
||||
|
||||
public UnregisteredPermissionException(PermissionNode node)
|
||||
public UnregisteredPermissionException(PermissionNode<?> node)
|
||||
{
|
||||
super(String.format(Locale.ENGLISH, "Tried to query PermissionNode '%s' although it has not been Registered", node.getNodeName()));
|
||||
this.node = node;
|
||||
}
|
||||
|
||||
public PermissionNode getNode()
|
||||
public PermissionNode<?> getNode()
|
||||
{
|
||||
return node;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user