BlinkingSkinPort 2.1.0 - 1.17, MidnightConfig and Predicates

Updated the entire mod to 1.17
Migrate to MidnightConfig
Add name predicate
Add server blacklist
This commit is contained in:
Motschen
2021-09-25 11:53:55 +02:00
parent 5b850a5afa
commit 7e2d00f035
12 changed files with 180 additions and 188 deletions

View File

@@ -1,8 +1,7 @@
package eu.midnightdust.blinkingskinport;
import eu.midnightdust.blinkingskinport.config.BlinkingSkinConfig;
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
import me.sargunvohra.mcmods.autoconfig1u.serializer.JanksonConfigSerializer;
import eu.midnightdust.blinkingskinport.mixin.GameOptionsAccessor;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.minecraft.client.render.entity.PlayerModelPart;
@@ -12,29 +11,28 @@ import java.util.Map;
public class BlinkingSkinClient implements ClientModInitializer {
public static BlinkingSkinConfig BS_CONFIG;
private final Map<PlayerModelPart, Integer> intervals = new HashMap<>();
@Override
public void onInitializeClient() {
AutoConfig.register(BlinkingSkinConfig.class, JanksonConfigSerializer::new);
BS_CONFIG = AutoConfig.getConfigHolder(BlinkingSkinConfig.class).getConfig();
BlinkingSkinConfig.init("blinkingskinport",BlinkingSkinConfig.class);
for (PlayerModelPart part : PlayerModelPart.values()) {
this.intervals.put(part, 0);
}
ClientTickEvents.END_CLIENT_TICK.register(client -> {
if (BS_CONFIG.enabled) {
if (BlinkingSkinConfig.enabled && (BlinkingSkinConfig.player.equals("") || client.getSession().getUsername().equals(BlinkingSkinConfig.player))) {
if (client.getCurrentServerEntry() != null && BlinkingSkinConfig.isBlacklisted(client.getCurrentServerEntry().address)) return;
for (Map.Entry<PlayerModelPart,Integer> interval : this.intervals.entrySet()) {
if (!BS_CONFIG.isEnabled(interval.getKey())) {
if (!BlinkingSkinConfig.isEnabled(interval.getKey())) {
continue;
}
int counter = this.intervals.get(interval.getKey());
if (counter++ >= BS_CONFIG.getToggleInterval(interval.getKey())) {
if (counter++ >= BlinkingSkinConfig.getToggleInterval(interval.getKey())) {
this.intervals.put(interval.getKey(), 0);
client.options.togglePlayerModelPart(interval.getKey());
client.options.togglePlayerModelPart(interval.getKey(), !((GameOptionsAccessor)client.options).getEnabledPlayerModelParts().contains(interval.getKey()));
}
else {
this.intervals.put(interval.getKey(), counter);