make it config-based

Alexandra-Myers · Aug 29, 2023 · 7e974af · 7e974af
1 parent dd705a1
commit 7e974af
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/net/atlas/combatify/config/CombatifyConfigModel.java b/src/main/java/net/atlas/combatify/config/CombatifyConfigModel.java
@@ -18,6 +18,7 @@ public class CombatifyConfigModel {
 	public boolean sprintCritsEnabled = true;
 	public boolean saturationHealing = false;
 	public boolean fastHealing = false;
+	public boolean letVanillaConnect = false;
 	public boolean oldSprintFoodRequirement = false;
 	public boolean projectilesHaveIFrames = false;
 	public boolean magicHasIFrames = true;

diff --git a/src/main/java/net/atlas/combatify/mixin/GameRendererMixin.java b/src/main/java/net/atlas/combatify/mixin/GameRendererMixin.java
@@ -10,6 +10,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 
+@SuppressWarnings("unused")
 @Mixin(GameRenderer.class)
 abstract class GameRendererMixin implements ResourceManagerReloadListener/*, AutoCloseable*/ {
     @Shadow

diff --git a/src/main/java/net/atlas/combatify/networking/NetworkingHandler.java b/src/main/java/net/atlas/combatify/networking/NetworkingHandler.java
@@ -17,13 +17,19 @@ public NetworkingHandler() {
 		ServerPlayNetworking.registerGlobalReceiver(modDetectionNetworkChannel,(server, player, handler, buf, responseSender) -> {
 		});
 		ServerPlayConnectionEvents.JOIN.register(modDetectionNetworkChannel,(handler, sender, server) -> {
-			boolean bl = CONFIG.configOnlyWeapons() || CONFIG.defender() || CONFIG.piercer();
+			boolean bl = CONFIG.configOnlyWeapons() || CONFIG.defender() || CONFIG.piercer() || !CONFIG.letVanillaConnect();
 			if(!ServerPlayNetworking.canSend(handler.player, modDetectionNetworkChannel)) {
-				if(bl)
+				if(bl) {
 					handler.player.connection.disconnect(Component.literal("Combatify needs to be installed on the client to join this server!"));
+					return;
+				}
 				Combatify.unmoddedPlayers.add(handler.player.getUUID());
 				Combatify.isPlayerAttacking.put(handler.player.getUUID(), true);
 				Combatify.finalizingAttack.put(handler.player.getUUID(), true);
+			} else if (unmoddedPlayers.contains(handler.player.getUUID())) {
+				unmoddedPlayers.remove(handler.player.getUUID());
+				isPlayerAttacking.remove(handler.player.getUUID());
+				finalizingAttack.remove(handler.player.getUUID());
 			}
 		});
 		AttackBlockCallback.EVENT.register(modDetectionNetworkChannel, (player, world, hand, pos, direction) -> {

diff --git a/src/main/resources/assets/combatify/lang/en_us.json b/src/main/resources/assets/combatify/lang/en_us.json
@@ -41,6 +41,7 @@
   "text.config.combatify-config.option.sprintCritsEnabled": "Can crit while sprinting",
   "text.config.combatify-config.option.saturationHealing": "Healing relies on saturation as a buffer, rather than just taking hunger",
   "text.config.combatify-config.option.fastHealing": "Allows for fast healing like in 1.11+ when you have high saturation",
+  "text.config.combatify-config.option.letVanillaConnect": "Option for servers which allows vanilla clients to connect",
   "text.config.combatify-config.option.oldSprintFoodRequirement": "Allows you to sprint until your hunger is empty like in CTS 5",
   "text.config.combatify-config.option.projectilesHaveIFrames": "Determines if projectile damage sources have I-Frames",
   "text.config.combatify-config.option.magicHasIFrames": "Determines if magic damage sources have I-Frames",