minecraft-mods/login_protection
Private
Public Access
1
0
Fork 0
Code Issues 1 Projects Releases 16 Wiki Activity

Updated configuration file layout. Added new post-protection features (configurable): water protection, lava protection and fire protection. Changed default configuration values.

Browse Source
This commit is contained in:
micle
2021-09-28 16:58:32 +01:00
parent 88d4bdf94c
commit 7d15055d43
4 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/micle/loginprotection/data/ProtectedPlayer.java
View File

@ -11,7 +11,7 @@ public class ProtectedPlayer {
public ProtectedPlayer(UUID player_uuid) { public ProtectedPlayer(UUID player_uuid) {
this.player_uuid = player_uuid; this.player_uuid = player_uuid;
this.grace_period = (Config.GRACE_LENGTH.get() * 40); this.grace_period = (Config.POST_GRACE_DURATION.get() * 40);
this.is_loading = true; this.is_loading = true;
} }

2
src/main/java/com/micle/loginprotection/data/ProtectedPlayers.java
View File

@ -39,7 +39,7 @@ public class ProtectedPlayers {
protected_players.remove(protected_player); protected_players.remove(protected_player);
ServerPlayer player = ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(player_uuid); ServerPlayer player = ServerLifecycleHooks.getCurrentServer().getPlayerList().getPlayer(player_uuid);
if (player == null || !Config.GRACE_ENABLED.get()) { return; } if (player == null || !Config.POST_GRACE_ENABLED.get()) { return; }
player.sendMessage(new TextComponent("Grace Period over!"), player_uuid); player.sendMessage(new TextComponent("Grace Period over!"), player_uuid);
} }

18
src/main/java/com/micle/loginprotection/network/C2SKeyPress.java
View File

@ -5,6 +5,9 @@ import com.micle.loginprotection.setup.Config;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.server.level.ServerPlayer; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraftforge.fmllegacy.network.NetworkEvent; import net.minecraftforge.fmllegacy.network.NetworkEvent;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -26,15 +29,26 @@ public class C2SKeyPress {
if (LoginProtection.protected_players.getPlayer(sender.getUUID()) == null) { return; } if (LoginProtection.protected_players.getPlayer(sender.getUUID()) == null) { return; }
if (!LoginProtection.protected_players.getPlayer(sender.getUUID()).isLoading()) { return; } if (!LoginProtection.protected_players.getPlayer(sender.getUUID()).isLoading()) { return; }
if (!Config.GRACE_ENABLED.get()) { if (!Config.POST_GRACE_ENABLED.get()) {
LoginProtection.protected_players.removePlayer(sender.getUUID()); LoginProtection.protected_players.removePlayer(sender.getUUID());
} else { } else {
LoginProtection.protected_players.getPlayer(sender.getUUID()).setLoading(false); LoginProtection.protected_players.getPlayer(sender.getUUID()).setLoading(false);
sender.sendMessage(new TextComponent("Grace Period started!"), sender.getUUID()); sender.sendMessage(new TextComponent("Grace Period started!"), sender.getUUID());
} }
if (sender.isInWater() && Config.KEY_REFILL_AIR.get()) { if (sender.isInWater()) {
if (Config.POST_DROWN_ENABLED.get()) {
sender.setAirSupply(sender.getMaxAirSupply()); sender.setAirSupply(sender.getMaxAirSupply());
} }
if (Config.POST_WATER_ENABLED.get()) {
sender.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, Config.POST_WATER_DURATION.get()*20, 0));
}
}
if (sender.isInLava() && Config.POST_LAVA_ENABLED.get()) {
sender.addEffect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, Config.POST_LAVA_DURATION.get()*20, 0));
}
if (sender.isOnFire() && Config.POST_FIRE_ENABLED.get()) {
sender.addEffect(new MobEffectInstance(MobEffects.FIRE_RESISTANCE, Config.POST_FIRE_DURATION.get()*20, 0));
}
}); });
context.setPacketHandled(true); context.setPacketHandled(true);
} }

70
src/main/java/com/micle/loginprotection/setup/Config.java
View File

@ -5,37 +5,65 @@ import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
public class Config { public class Config {
public static ForgeConfigSpec COMMON_CONFIG; public static ForgeConfigSpec SERVER_CONFIG;
public static ForgeConfigSpec.BooleanValue GRACE_ENABLED; public static ForgeConfigSpec.BooleanValue POST_GRACE_ENABLED;
public static ForgeConfigSpec.IntValue GRACE_LENGTH; public static ForgeConfigSpec.IntValue POST_GRACE_DURATION;
public static ForgeConfigSpec.BooleanValue POST_DROWN_ENABLED;
public static ForgeConfigSpec.BooleanValue KEY_REFILL_AIR; public static ForgeConfigSpec.BooleanValue POST_WATER_ENABLED;
public static ForgeConfigSpec.IntValue POST_WATER_DURATION;
public static ForgeConfigSpec.BooleanValue POST_LAVA_ENABLED;
public static ForgeConfigSpec.IntValue POST_LAVA_DURATION;
public static ForgeConfigSpec.BooleanValue POST_FIRE_ENABLED;
public static ForgeConfigSpec.IntValue POST_FIRE_DURATION;
public static void init() { public static void init() {
initCommon(); initServer();
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, COMMON_CONFIG); ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, SERVER_CONFIG);
} }
private static void initCommon() { private static void initServer() {
ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder(); ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
builder.comment("Grace period settings").push("grace"); builder.comment("Additional protection settings that apply as soon as a player becomes active.").push("post");
GRACE_ENABLED = builder builder.push("grace_period");
POST_GRACE_ENABLED = builder
.comment("Whether a player receives a grace period after becoming active or not.") .comment("Whether a player receives a grace period after becoming active or not.")
.define("graceEnabled", true); .define("graceEnabled", false);
GRACE_LENGTH = builder POST_GRACE_DURATION = builder
.comment("How long the grace period lasts for a player in seconds.") .comment("Grace period duration in seconds.")
.defineInRange("graceLength", 10, 1, Integer.MAX_VALUE/40); .defineInRange("graceDuration", 10, 1, Integer.MAX_VALUE/40);
builder.pop();
builder.push("water_protection");
POST_DROWN_ENABLED = builder
.comment("Whether a player's air supply gets refilled.")
.define("drownEnabled", true);
POST_WATER_ENABLED = builder
.comment("Whether a player receives water breating when in water.")
.define("waterEnabled", false);
POST_WATER_DURATION = builder
.comment("Water breathing duration in seconds.")
.defineInRange("waterDuration", 10, 1, Integer.MAX_VALUE/20);
builder.pop();
builder.push("lava_protection");
POST_LAVA_ENABLED = builder
.comment("Whether a player receives fire resistance when in lava.")
.define("lavaEnabled", true);
POST_LAVA_DURATION = builder
.comment("Fire resistance duration in seconds.")
.defineInRange("lavaDuration", 10, 1, Integer.MAX_VALUE/20);
builder.pop();
builder.push("fire_protection");
POST_FIRE_ENABLED = builder
.comment("Whether a player receives fire resistance when on fire.")
.define("fireEnabled", false);
POST_FIRE_DURATION = builder
.comment("Fire resistance duration in seconds.")
.defineInRange("fireDuration", 10, 1, Integer.MAX_VALUE/20);
builder.pop();
builder.pop(); builder.pop();
builder.comment("Key settings").push("key"); SERVER_CONFIG = builder.build();
KEY_REFILL_AIR = builder
.comment("Whether a player's air supply gets refilled upon becoming active.")
.define("keyRefillAir", true);
builder.pop();
COMMON_CONFIG = builder.build();
} }
} }