mirror of
https://github.com/TeamMidnightDust/BlinkingSkinPort.git
synced 2025-12-18 03:35:09 +01:00
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
16
src/main/java/eu/midnightdust/blinkingskinport/BlinkingSkinClient.java
Normal file → Executable file
16
src/main/java/eu/midnightdust/blinkingskinport/BlinkingSkinClient.java
Normal file → Executable 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);
|
||||
|
||||
125
src/main/java/eu/midnightdust/blinkingskinport/config/BlinkingSkinConfig.java
Normal file → Executable file
125
src/main/java/eu/midnightdust/blinkingskinport/config/BlinkingSkinConfig.java
Normal file → Executable file
@@ -1,91 +1,62 @@
|
||||
package eu.midnightdust.blinkingskinport.config;
|
||||
|
||||
import me.sargunvohra.mcmods.autoconfig1u.ConfigData;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.Config;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.annotation.ConfigEntry;
|
||||
import me.sargunvohra.mcmods.autoconfig1u.shadowed.blue.endless.jankson.Comment;
|
||||
import eu.midnightdust.lib.config.MidnightConfig;
|
||||
import net.minecraft.client.render.entity.PlayerModelPart;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Arrays;
|
||||
|
||||
@Config(name = "blinkingskinport")
|
||||
public class BlinkingSkinConfig implements ConfigData {
|
||||
public class BlinkingSkinConfig extends MidnightConfig {
|
||||
|
||||
@ConfigEntry.Gui.PrefixText // Blink Intervals lower than 5 are disabled, because they can be used to trigger epileptic episodes, which isn't fun for affected people!
|
||||
public boolean enabled = false;
|
||||
@Entry public static boolean enabled = false;
|
||||
|
||||
@ConfigEntry.Gui.PrefixText
|
||||
public boolean capeEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int capeBlinkInterval = 20;
|
||||
public boolean hatEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int hatBlinkInterval = 20;
|
||||
public boolean jacketEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int jacketBlinkInterval = 20;
|
||||
public boolean leftSleeveEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int leftSleeveBlinkInterval = 20;
|
||||
public boolean rightSleeveEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int rightSleeveBlinkInterval = 20;
|
||||
public boolean leftPantsLegEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int leftPantsLegBlinkInterval = 20;
|
||||
public boolean rightPantsLegEnabled = true;
|
||||
@ConfigEntry.BoundedDiscrete(min = 5, max = 200)
|
||||
@Comment("(20 ticks = 1 second)")
|
||||
public int rightPantsLegBlinkInterval = 20;
|
||||
@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 ";"
|
||||
|
||||
@Comment public static Comment spacer;
|
||||
@Entry public static boolean capeEnabled = true;
|
||||
@Entry public static boolean hatEnabled = true;
|
||||
@Entry public static boolean jacketEnabled = true;
|
||||
@Entry public static boolean leftSleeveEnabled = true;
|
||||
@Entry public static boolean rightSleeveEnabled = true;
|
||||
@Entry public static boolean leftPantsLegEnabled = true;
|
||||
@Entry public static boolean rightPantsLegEnabled = true;
|
||||
@Comment public static Comment spacer2;
|
||||
@Comment public static Comment disclaimer; // Blink Intervals lower than 5 are disabled, because they can be used to trigger epileptic episodes, which isn't fun for affected people!
|
||||
@Comment public static Comment disclaimer2;
|
||||
@Entry(min = 5, max = 1000) public static int capeBlinkInterval = 20;
|
||||
@Entry(min = 5, max = 1000) public static int hatBlinkInterval = 20;
|
||||
@Entry(min = 5, max = 1000) public static int jacketBlinkInterval = 20;
|
||||
@Entry(min = 5, max = 1000) public static int leftSleeveBlinkInterval = 20;
|
||||
@Entry(min = 5, max = 1000) public static int rightSleeveBlinkInterval = 20;
|
||||
@Entry(min = 5, max = 1000) public static int leftPantsLegBlinkInterval = 20;
|
||||
@Entry(min = 5, max = 1000) public static int rightPantsLegBlinkInterval = 20;
|
||||
|
||||
public boolean isEnabled(PlayerModelPart part) {
|
||||
switch (part) {
|
||||
case HAT:
|
||||
return hatEnabled;
|
||||
case CAPE:
|
||||
return capeEnabled;
|
||||
case JACKET:
|
||||
return jacketEnabled;
|
||||
case LEFT_SLEEVE:
|
||||
return leftSleeveEnabled;
|
||||
case RIGHT_SLEEVE:
|
||||
return rightSleeveEnabled;
|
||||
case LEFT_PANTS_LEG:
|
||||
return leftPantsLegEnabled;
|
||||
case RIGHT_PANTS_LEG:
|
||||
return rightPantsLegEnabled;
|
||||
default:
|
||||
throw new AssertionError("Could not get value for " + part);
|
||||
}
|
||||
public static boolean isEnabled(PlayerModelPart part) {
|
||||
return switch (part) {
|
||||
case HAT -> hatEnabled;
|
||||
case CAPE -> capeEnabled;
|
||||
case JACKET -> jacketEnabled;
|
||||
case LEFT_SLEEVE -> leftSleeveEnabled;
|
||||
case RIGHT_SLEEVE -> rightSleeveEnabled;
|
||||
case LEFT_PANTS_LEG -> leftPantsLegEnabled;
|
||||
case RIGHT_PANTS_LEG -> rightPantsLegEnabled;
|
||||
};
|
||||
}
|
||||
|
||||
public int getToggleInterval(PlayerModelPart part) {
|
||||
switch (part) {
|
||||
case HAT:
|
||||
return hatBlinkInterval;
|
||||
case CAPE:
|
||||
return capeBlinkInterval;
|
||||
case JACKET:
|
||||
return jacketBlinkInterval;
|
||||
case LEFT_SLEEVE:
|
||||
return leftSleeveBlinkInterval;
|
||||
case RIGHT_SLEEVE:
|
||||
return rightSleeveBlinkInterval;
|
||||
case LEFT_PANTS_LEG:
|
||||
return leftPantsLegBlinkInterval;
|
||||
case RIGHT_PANTS_LEG:
|
||||
return rightPantsLegBlinkInterval;
|
||||
default:
|
||||
throw new AssertionError("Could not get interval for " + part);
|
||||
}
|
||||
public static int getToggleInterval(PlayerModelPart part) {
|
||||
return switch (part) {
|
||||
case HAT -> hatBlinkInterval;
|
||||
case CAPE -> capeBlinkInterval;
|
||||
case JACKET -> jacketBlinkInterval;
|
||||
case LEFT_SLEEVE -> leftSleeveBlinkInterval;
|
||||
case RIGHT_SLEEVE -> rightSleeveBlinkInterval;
|
||||
case LEFT_PANTS_LEG -> leftPantsLegBlinkInterval;
|
||||
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));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
package eu.midnightdust.blinkingskinport.mixin;
|
||||
|
||||
import net.minecraft.client.option.GameOptions;
|
||||
import net.minecraft.client.render.entity.PlayerModelPart;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@Mixin(GameOptions.class)
|
||||
public interface GameOptionsAccessor {
|
||||
@Accessor
|
||||
Set<PlayerModelPart> getEnabledPlayerModelParts();
|
||||
}
|
||||
51
src/main/resources/assets/blinkingskinport/lang/en_us.json
Normal file → Executable file
51
src/main/resources/assets/blinkingskinport/lang/en_us.json
Normal file → Executable file
@@ -1,23 +1,36 @@
|
||||
{
|
||||
"text.autoconfig.blinkingskinport.title":"BlinkingSkinPort Config",
|
||||
"blinkingskinport.midnightconfig.title":"BlinkingSkinPort Config",
|
||||
|
||||
"text.autoconfig.blinkingskinport.option.enabled":"Enable Mod",
|
||||
"blinkingskinport.midnightconfig.enabled":"Enable Mod",
|
||||
"blinkingskinport.midnightconfig.player":"Enabled Account Name",
|
||||
"blinkingskinport.midnightconfig.player.tooltip":"Optional. For multi-account users.",
|
||||
"blinkingskinport.midnightconfig.server_blacklist":"Server Blacklist",
|
||||
"blinkingskinport.midnightconfig.server_blacklist.tooltip":"Optional. Separate entries with Semicolon [ ; ]",
|
||||
|
||||
"text.autoconfig.blinkingskinport.option.capeEnabled.@PrefixText":" ",
|
||||
"text.autoconfig.blinkingskinport.option.capeEnabled":"Blink Cape",
|
||||
"text.autoconfig.blinkingskinport.option.hatEnabled":"Blink Hat",
|
||||
"text.autoconfig.blinkingskinport.option.jacketEnabled":"Blink Jacket",
|
||||
"text.autoconfig.blinkingskinport.option.leftSleeveEnabled":"Blink Left Sleeve",
|
||||
"text.autoconfig.blinkingskinport.option.rightSleeveEnabled":"Blink Right Sleeve",
|
||||
"text.autoconfig.blinkingskinport.option.leftPantsLegEnabled":"Blink Left Pants",
|
||||
"text.autoconfig.blinkingskinport.option.rightPantsLegEnabled":"Blink Right Pants",
|
||||
|
||||
"text.autoconfig.blinkingskinport.option.enabled.@PrefixText":"§cBlink Intervals lower than 5 are disabled, because they can be used to trigger epileptic episodes, which isn't fun for affected people!",
|
||||
"text.autoconfig.blinkingskinport.option.capeBlinkInterval":"Cape Blink Interval",
|
||||
"text.autoconfig.blinkingskinport.option.hatBlinkInterval":"Hat Blink Interval",
|
||||
"text.autoconfig.blinkingskinport.option.jacketBlinkInterval":"Jacket Blink Interval",
|
||||
"text.autoconfig.blinkingskinport.option.leftSleeveBlinkInterval":"Left Sleeve Blink Interval",
|
||||
"text.autoconfig.blinkingskinport.option.rightSleeveBlinkInterval":"Right Sleeve Blink Interval",
|
||||
"text.autoconfig.blinkingskinport.option.leftPantsLegBlinkInterval":"Left Pants Blink Interval",
|
||||
"text.autoconfig.blinkingskinport.option.rightPantsLegBlinkInterval":"Right Pants Blink Interval"
|
||||
"blinkingskinport.midnightconfig.spacer":"",
|
||||
"blinkingskinport.midnightconfig.capeEnabled":"Blink Cape",
|
||||
"blinkingskinport.midnightconfig.hatEnabled":"Blink Hat",
|
||||
"blinkingskinport.midnightconfig.jacketEnabled":"Blink Jacket",
|
||||
"blinkingskinport.midnightconfig.leftSleeveEnabled":"Blink Left Sleeve",
|
||||
"blinkingskinport.midnightconfig.rightSleeveEnabled":"Blink Right Sleeve",
|
||||
"blinkingskinport.midnightconfig.leftPantsLegEnabled":"Blink Left Pants",
|
||||
"blinkingskinport.midnightconfig.rightPantsLegEnabled":"Blink Right Pants",
|
||||
|
||||
"blinkingskinport.midnightconfig.spacer2":"",
|
||||
"blinkingskinport.midnightconfig.disclaimer":"§cBlink Intervals lower than 5 are disabled, because they could",
|
||||
"blinkingskinport.midnightconfig.disclaimer2":"§ctrigger epileptic seizures, which isn't fun for affected people!",
|
||||
"blinkingskinport.midnightconfig.capeBlinkInterval":"Cape Blink Interval",
|
||||
"blinkingskinport.midnightconfig.capeBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
|
||||
"blinkingskinport.midnightconfig.hatBlinkInterval":"Hat Blink Interval",
|
||||
"blinkingskinport.midnightconfig.hatBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
|
||||
"blinkingskinport.midnightconfig.jacketBlinkInterval":"Jacket Blink Interval",
|
||||
"blinkingskinport.midnightconfig.jacketBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
|
||||
"blinkingskinport.midnightconfig.leftSleeveBlinkInterval":"Left Sleeve Blink Interval",
|
||||
"blinkingskinport.midnightconfig.leftSleeveBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
|
||||
"blinkingskinport.midnightconfig.rightSleeveBlinkInterval":"Right Sleeve Blink Interval",
|
||||
"blinkingskinport.midnightconfig.rightSleeveBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
|
||||
"blinkingskinport.midnightconfig.leftPantsLegBlinkInterval":"Left Pants Blink Interval",
|
||||
"blinkingskinport.midnightconfig.leftPantsLegBlinkInterval.tooltip":"§2(20 ticks = 1 second)",
|
||||
"blinkingskinport.midnightconfig.rightPantsLegBlinkInterval":"Right Pants Blink Interval",
|
||||
"blinkingskinport.midnightconfig.rightPantsLegBlinkInterval.tooltip":"§2(20 ticks = 1 second)"
|
||||
}
|
||||
11
src/main/resources/blinkingskinport.mixins.json
Executable file
11
src/main/resources/blinkingskinport.mixins.json
Executable file
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"required": true,
|
||||
"package": "eu.midnightdust.blinkingskinport.mixin",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"client": [
|
||||
"GameOptionsAccessor"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
10
src/main/resources/fabric.mod.json
Normal file → Executable file
10
src/main/resources/fabric.mod.json
Normal file → Executable file
@@ -22,13 +22,13 @@
|
||||
"entrypoints": {
|
||||
"client": [
|
||||
"eu.midnightdust.blinkingskinport.BlinkingSkinClient"
|
||||
],
|
||||
"modmenu": [
|
||||
"eu.midnightdust.blinkingskinport.config.ModMenuIntegration"
|
||||
]
|
||||
},
|
||||
|
||||
"depends": {
|
||||
"fabric": "*"
|
||||
}
|
||||
"midnightlib": "*"
|
||||
},
|
||||
"mixins": [
|
||||
"blinkingskinport.mixins.json"
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user