Lixfel/AltAuth
1
0
Fork 0
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Refactor packages, add license header

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Lixfel 2022-09-24 11:53:07 +02:00
Ursprung 4dc4331713
Commit d307fb90cf
11 geänderte Dateien mit 42 neuen und 28 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
fabric/src/alt-auth.mixins.json
Datei anzeigen

@ -1,7 +1,7 @@
{ {
"required": true, "required": true,
"minVersion": "0.8", "minVersion": "0.8",
"package": "de.chaoscaot.altauth.mixin", "package": "de.chaoscaot.altauth.fabric.mixin",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"client": [ "client": [
"client.LoginRequestMixin" "client.LoginRequestMixin"

4
fabric/src/de/chaoscaot/altauth/AltAuthClient.java → fabric/src/de/chaoscaot/altauth/fabric/AltAuthClient.java
Datei anzeigen

@ -1,4 +1,6 @@
package de.chaoscaot.altauth; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;

15
fabric/src/de/chaoscaot/altauth/config/client/AltAuthClientConfig.java → fabric/src/de/chaoscaot/altauth/fabric/AltAuthClientConfig.java
Datei anzeigen

@ -1,6 +1,7 @@
package de.chaoscaot.altauth.config.client; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric;
import de.chaoscaot.altauth.AltAuth;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import java.io.File; import java.io.File;
@ -20,10 +21,10 @@ public class AltAuthClientConfig {
INSTANCE = new AltAuthClientConfig(); INSTANCE = new AltAuthClientConfig();
} else { } else {
try { try {
INSTANCE = AltAuth.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthClientConfig.class); INSTANCE = AltAuthFabric.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthClientConfig.class);
} catch (IOException e) { } catch (IOException e) {
AltAuth.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while loading config", e); AltAuthFabric.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while loading config", e);
AltAuth.LOGGER.info("Reset Config..."); AltAuthFabric.LOGGER.info("Reset Config...");
INSTANCE = new AltAuthClientConfig(); INSTANCE = new AltAuthClientConfig();
INSTANCE.save(); INSTANCE.save();
} }
@ -35,9 +36,9 @@ public class AltAuthClientConfig {
public void save() { public void save() {
try { try {
Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuth.GSON.toJson(this)); Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuthFabric.GSON.toJson(this));
} catch (IOException e) { } catch (IOException e) {
AltAuth.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while saving config", e); AltAuthFabric.LOGGER.error("AltauthClient: AltAuthClientConfig: Error while saving config", e);
} }
} }
} }

6
fabric/src/de/chaoscaot/altauth/AltAuth.java → fabric/src/de/chaoscaot/altauth/fabric/AltAuthFabric.java
Datei anzeigen

@ -1,4 +1,6 @@
package de.chaoscaot.altauth; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
@ -6,7 +8,7 @@ import net.fabricmc.api.ModInitializer;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
public class AltAuth implements ModInitializer { public class AltAuthFabric implements ModInitializer {
public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); public static final Gson GSON = new GsonBuilder().setPrettyPrinting().create();
public static final Logger LOGGER = LogManager.getLogger(); public static final Logger LOGGER = LogManager.getLogger();

4
fabric/src/de/chaoscaot/altauth/AltAuthServer.java → fabric/src/de/chaoscaot/altauth/fabric/AltAuthServer.java
Datei anzeigen

@ -1,4 +1,6 @@
package de.chaoscaot.altauth; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric;
import net.fabricmc.api.DedicatedServerModInitializer; import net.fabricmc.api.DedicatedServerModInitializer;

17
fabric/src/de/chaoscaot/altauth/config/server/AltAuthServerConfig.java → fabric/src/de/chaoscaot/altauth/fabric/AltAuthServerConfig.java
Datei anzeigen

@ -1,6 +1,7 @@
package de.chaoscaot.altauth.config.server; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric;
import de.chaoscaot.altauth.AltAuth;
import net.fabricmc.loader.api.FabricLoader; import net.fabricmc.loader.api.FabricLoader;
import java.io.File; import java.io.File;
@ -18,14 +19,14 @@ public class AltAuthServerConfig {
INSTANCE = new AltAuthServerConfig(); INSTANCE = new AltAuthServerConfig();
} else { } else {
try { try {
INSTANCE = AltAuth.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthServerConfig.class); INSTANCE = AltAuthFabric.GSON.fromJson(Files.readString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME)), AltAuthServerConfig.class);
if(INSTANCE.serverUrl.length() > 20) { if(INSTANCE.serverUrl.length() > 20) {
AltAuth.LOGGER.error("AltauthServer: AltAuthServerConfig: ServerUrl is too long. Max length is 20 characters"); AltAuthFabric.LOGGER.error("AltauthServer: AltAuthServerConfig: ServerUrl is too long. Max length is 20 characters");
INSTANCE.serverUrl = ""; INSTANCE.serverUrl = "";
} }
} catch (IOException e) { } catch (IOException e) {
AltAuth.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while loading config", e); AltAuthFabric.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while loading config", e);
AltAuth.LOGGER.info("Reset Config..."); AltAuthFabric.LOGGER.info("Reset Config...");
INSTANCE = new AltAuthServerConfig(); INSTANCE = new AltAuthServerConfig();
INSTANCE.save(); INSTANCE.save();
} }
@ -36,9 +37,9 @@ public class AltAuthServerConfig {
public void save() { public void save() {
try { try {
Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuth.GSON.toJson(this)); Files.writeString(FabricLoader.getInstance().getConfigDir().resolve(CONFIG_FILE_NAME), AltAuthFabric.GSON.toJson(this));
} catch (IOException e) { } catch (IOException e) {
AltAuth.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while saving config", e); AltAuthFabric.LOGGER.error("AltauthServer: AltAuthServerConfig: Error while saving config", e);
} }
} }
} }

4
fabric/src/de/chaoscaot/altauth/gui/ApproveServerScreen.java → fabric/src/de/chaoscaot/altauth/fabric/ApproveServerScreen.java
Datei anzeigen

@ -1,4 +1,6 @@
package de.chaoscaot.altauth.gui; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;

4
fabric/src/de/chaoscaot/altauth/mixin/client/LoginRequestMixin.java → fabric/src/de/chaoscaot/altauth/fabric/mixin/LoginRequestMixin.java
Datei anzeigen

@ -1,4 +1,6 @@
package de.chaoscaot.altauth.mixin.client; // SPDX-License-Identifier: MIT
package de.chaoscaot.altauth.fabric.mixin;
import com.mojang.authlib.yggdrasil.YggdrasilEnvironment; import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;

6
fabric/src/de/chaoscaot/altauth/mixin/server/ServerIdMixin.java → fabric/src/de/chaoscaot/altauth/fabric/mixin/ServerIdMixin.java
Datei anzeigen

@ -1,6 +1,8 @@
package de.chaoscaot.altauth.mixin.server; // SPDX-License-Identifier: MIT
import de.chaoscaot.altauth.config.server.AltAuthServerConfig; package de.chaoscaot.altauth.fabric.mixin;
import de.chaoscaot.altauth.fabric.AltAuthServerConfig;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.minecraft.network.PacketByteBuf; import net.minecraft.network.PacketByteBuf;

6
fabric/src/fabric.mod.json
Datei anzeigen

@ -10,13 +10,13 @@
"environment": "*", "environment": "*",
"entrypoints": { "entrypoints": {
"main": [ "main": [
"de.chaoscaot.altauth.AltAuth" "de.chaoscaot.altauth.fabric.AltAuth"
], ],
"client": [ "client": [
"de.chaoscaot.altauth.AltAuthClient" "de.chaoscaot.altauth.fabric.AltAuthClient"
], ],
"server": [ "server": [
"de.chaoscaot.altauth.AltAuthServer" "de.chaoscaot.altauth.fabric.AltAuthServer"
] ]
}, },
"mixins": [ "mixins": [

2
proxy.py
Datei anzeigen

@ -177,7 +177,7 @@ class AltAuthRequestHandler(BaseHTTPRequestHandler):
except BaseException as e: except BaseException as e:
print(e) print(e)
self.send_response(HTTPStatus.INTERNAL_SERVER_ERROR) self.send_response(HTTPStatus.FORBIDDEN)
self.end_headers() self.end_headers()