centralize all ModConfig.SERVER reads through SettingsAccessor
No more direct ModConfig.SERVER access outside SettingsAccessor. 32 new accessor methods, 21 consumer files rerouted.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package com.tiedup.remake.entities.damsel.components;
|
||||
|
||||
import com.tiedup.remake.core.ModConfig;
|
||||
import com.tiedup.remake.core.SettingsAccessor;
|
||||
import com.tiedup.remake.core.TiedUpMod;
|
||||
import com.tiedup.remake.entities.EntityDamsel;
|
||||
import com.tiedup.remake.entities.ai.damsel.*;
|
||||
@@ -223,7 +223,7 @@ public class DamselAIController {
|
||||
Player.class,
|
||||
host
|
||||
.getBoundingBox()
|
||||
.inflate(ModConfig.SERVER.dialogueRadius.get())
|
||||
.inflate(SettingsAccessor.getDialogueRadius())
|
||||
);
|
||||
|
||||
// Get captor entity for comparison
|
||||
@@ -258,7 +258,7 @@ public class DamselAIController {
|
||||
}
|
||||
|
||||
// Reset cooldown
|
||||
int baseCooldown = ModConfig.SERVER.dialogueCooldown.get();
|
||||
int baseCooldown = SettingsAccessor.getDialogueCooldown();
|
||||
if (foundTarget) {
|
||||
// Full cooldown if we talked
|
||||
this.callForHelpCooldown =
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.tiedup.remake.entities.damsel.components;
|
||||
|
||||
import com.tiedup.remake.core.ModConfig;
|
||||
import com.tiedup.remake.core.SettingsAccessor;
|
||||
import com.tiedup.remake.dialogue.EntityDialogueManager;
|
||||
import com.tiedup.remake.dialogue.EntityDialogueManager.DialogueCategory;
|
||||
import java.util.HashMap;
|
||||
@@ -101,7 +101,7 @@ public class DamselDialogueHandler {
|
||||
|
||||
if (
|
||||
lastUsed != null &&
|
||||
(currentTick - lastUsed) < ModConfig.SERVER.dialogueCooldown.get()
|
||||
(currentTick - lastUsed) < SettingsAccessor.getDialogueCooldown()
|
||||
) {
|
||||
return false; // Still on cooldown
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.tiedup.remake.entities.damsel.components;
|
||||
|
||||
import com.tiedup.remake.core.ModConfig;
|
||||
import com.tiedup.remake.core.SettingsAccessor;
|
||||
import com.tiedup.remake.core.TiedUpMod;
|
||||
import com.tiedup.remake.entities.AbstractTiedUpNpc;
|
||||
import com.tiedup.remake.state.ICaptor;
|
||||
@@ -137,7 +137,7 @@ public class NpcCaptivityManager {
|
||||
if (!entity.level().isClientSide()) {
|
||||
host.talkToPlayersInRadius(
|
||||
com.tiedup.remake.dialogue.EntityDialogueManager.DialogueCategory.DAMSEL_FREED,
|
||||
ModConfig.SERVER.dialogueRadius.get()
|
||||
SettingsAccessor.getDialogueRadius()
|
||||
);
|
||||
}
|
||||
} else {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.tiedup.remake.entities.damsel.components;
|
||||
|
||||
import com.tiedup.remake.core.ModConfig;
|
||||
import com.tiedup.remake.core.SettingsAccessor;
|
||||
import com.tiedup.remake.core.TiedUpMod;
|
||||
import com.tiedup.remake.entities.AbstractTiedUpNpc;
|
||||
import com.tiedup.remake.items.base.ILockable;
|
||||
@@ -206,7 +206,7 @@ public class NpcEquipmentManager {
|
||||
if (!wasAlreadyTied && !entity.level().isClientSide()) {
|
||||
host.talkToPlayersInRadius(
|
||||
com.tiedup.remake.dialogue.EntityDialogueManager.DialogueCategory.DAMSEL_CAPTURED,
|
||||
ModConfig.SERVER.dialogueRadius.get()
|
||||
SettingsAccessor.getDialogueRadius()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user