BlinkingSkinPort 2.1.1 - Update to 1.19

This commit is contained in:
Motschen
2022-06-18 13:09:14 +02:00
parent 7e2d00f035
commit 8f5568c0dc
10 changed files with 269 additions and 236 deletions

View File

@@ -23,7 +23,7 @@ public class BlinkingSkinClient implements ClientModInitializer {
ClientTickEvents.END_CLIENT_TICK.register(client -> {
if (BlinkingSkinConfig.enabled && (BlinkingSkinConfig.player.equals("") || client.getSession().getUsername().equals(BlinkingSkinConfig.player))) {
if (client.getCurrentServerEntry() != null && BlinkingSkinConfig.isBlacklisted(client.getCurrentServerEntry().address)) return;
if (client.getCurrentServerEntry() != null && BlinkingSkinConfig.isBlocklisted(client.getCurrentServerEntry().address)) return;
for (Map.Entry<PlayerModelPart,Integer> interval : this.intervals.entrySet()) {
if (!BlinkingSkinConfig.isEnabled(interval.getKey())) {
continue;

View File

@@ -3,14 +3,17 @@ package eu.midnightdust.blinkingskinport.config;
import eu.midnightdust.lib.config.MidnightConfig;
import net.minecraft.client.render.entity.PlayerModelPart;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class BlinkingSkinConfig extends MidnightConfig {
@Entry public static boolean enabled = false;
@Entry public static String player = ""; // Optional: Only enable the mod when the name matches the currently active account. Useful for users with multiple minecraft accounts
@Entry public static String server_blacklist = ""; // Blacklist servers. Seperate with ";"
@Entry public static List<String> serverBlocklist = new ArrayList<>();
@Entry public static boolean useBlocklistAsAllowlist = false;
@Comment public static Comment spacer;
@Entry public static boolean capeEnabled = true;
@@ -54,9 +57,9 @@ public class BlinkingSkinConfig extends MidnightConfig {
case RIGHT_PANTS_LEG -> rightPantsLegBlinkInterval;
};
}
public static boolean isBlacklisted(String address) {
if (server_blacklist.isBlank()) return false;
return Arrays.stream(server_blacklist.split(";")).anyMatch(ip -> ip.contains(address));
public static boolean isBlocklisted(String address) {
if (serverBlocklist.isEmpty()) return useBlocklistAsAllowlist;
return serverBlocklist.contains(address) != useBlocklistAsAllowlist;
}
}

View File

@@ -1,16 +0,0 @@
package eu.midnightdust.blinkingskinport.config;
import io.github.prospector.modmenu.api.ConfigScreenFactory;
import io.github.prospector.modmenu.api.ModMenuApi;
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
@Environment(EnvType.CLIENT)
public class ModMenuIntegration implements ModMenuApi {
@Override
public ConfigScreenFactory<?> getModConfigScreenFactory() {
return parent -> AutoConfig.getConfigScreen(BlinkingSkinConfig.class, parent).get();
}
}