OMGeeky/ATCS
1
0
Fork 0
mirror of https://github.com/OMGeeky/ATCS.git synced 2025-12-26 15:57:22 +01:00
Code Issues Packages Projects Releases 15 Wiki Activity

move ListModels to CommonEditor for re-use

Browse Source
This commit is contained in:
OMGeeky
2025-06-24 16:07:50 +02:00
parent 6dcd8599b3
commit b7e9bf0582
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/CommonEditor.java
View File

@@ -15,6 +15,7 @@ import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.List;
import java.util.function.Supplier;
import static com.gpl.rpg.atcontentstudio.ui.Editor.addIntegerField;
@@ -617,4 +618,41 @@ public class CommonEditor {
return updateHit;
}
}
//region list-models
public static class TargetTimedConditionsListModel extends OrderedListenerListModel<Common.HitEffect, Common.TimedActorConditionEffect> {
public TargetTimedConditionsListModel(Common.HitEffect effect) {
super(effect);
}
@Override
protected java.util.List<Common.TimedActorConditionEffect> getItems() {
return source.conditions_target;
}
@Override
protected void setItems(java.util.List<Common.TimedActorConditionEffect> items) {
source.conditions_target = items;
}
}
public static class SourceTimedConditionsListModel extends OrderedListenerListModel<Common.DeathEffect, Common.TimedActorConditionEffect> {
public SourceTimedConditionsListModel(Common.DeathEffect effect) {
super(effect);
}
@Override
protected java.util.List<Common.TimedActorConditionEffect> getItems() {
return source.conditions_source;
}
@Override
protected void setItems(List<Common.TimedActorConditionEffect> items) {
source.conditions_source = items;
}
}
//endregion
}

37
src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/NPCEditor.java
View File

@@ -151,7 +151,7 @@ public class NPCEditor extends JSONElementEditor {
}
if (hitEffectPane == null)
hitEffectPane = new CommonEditor.HitEffectPane("Effect on every hit: ", Common.TimedActorConditionEffect::new, this, null, null);
hitEffectPane.createHitEffectPaneContent(listener, npc.writable, hitEffect, new SourceTimedConditionsListModel(hitEffect), new TargetTimedConditionsListModel(hitEffect));
hitEffectPane.createHitEffectPaneContent(listener, npc.writable, hitEffect, new CommonEditor.SourceTimedConditionsListModel(hitEffect), new CommonEditor.TargetTimedConditionsListModel(hitEffect));
combatTraitPane.add(hitEffectPane.effectPane, JideBoxLayout.FIX);
Common.HitReceivedEffect hitReceivedEffect;
@@ -162,7 +162,7 @@ public class NPCEditor extends JSONElementEditor {
}
if (hitReceivedEffectPane == null)
hitReceivedEffectPane = new CommonEditor.HitRecievedEffectPane("Effect on every hit received: ", Common.TimedActorConditionEffect::new, this, "NPC", "Attacker");
hitReceivedEffectPane.createHitReceivedEffectPaneContent(listener, npc.writable, hitReceivedEffect, new SourceTimedConditionsListModel(hitReceivedEffect), new TargetTimedConditionsListModel(hitReceivedEffect));
hitReceivedEffectPane.createHitReceivedEffectPaneContent(listener, npc.writable, hitReceivedEffect, new CommonEditor.SourceTimedConditionsListModel(hitReceivedEffect), new CommonEditor.TargetTimedConditionsListModel(hitReceivedEffect));
combatTraitPane.add(hitReceivedEffectPane.effectPane, JideBoxLayout.FIX);
Common.DeathEffect deathEffect;
@@ -173,44 +173,13 @@ public class NPCEditor extends JSONElementEditor {
}
if (deathEffectPane == null)
deathEffectPane = new CommonEditor.DeathEffectPane("Effect when killed: ", Common.TimedActorConditionEffect::new, this, "Killer");
deathEffectPane.createDeathEffectPaneContent(listener, npc.writable, deathEffect, new SourceTimedConditionsListModel(deathEffect)
deathEffectPane.createDeathEffectPaneContent(listener, npc.writable, deathEffect, new CommonEditor.SourceTimedConditionsListModel(deathEffect)
);
combatTraitPane.add(deathEffectPane.effectPane, JideBoxLayout.FIX);
pane.add(combatTraitPane, JideBoxLayout.FIX);
}
public static class TargetTimedConditionsListModel extends OrderedListenerListModel<Common.HitEffect, Common.TimedActorConditionEffect> {
public TargetTimedConditionsListModel(Common.HitEffect effect) {
super(effect);
}
@Override
protected List<Common.TimedActorConditionEffect> getItems() {
return source.conditions_target;
}
@Override
protected void setItems(List<Common.TimedActorConditionEffect> items) {
source.conditions_target = items;
}
}
public static class SourceTimedConditionsListModel extends OrderedListenerListModel<Common.DeathEffect, Common.TimedActorConditionEffect> {
public SourceTimedConditionsListModel(Common.DeathEffect effect) {
super(effect);
}
@Override
protected List<Common.TimedActorConditionEffect> getItems() {
return source.conditions_source;
}
@Override
protected void setItems(List<Common.TimedActorConditionEffect> items) {
source.conditions_source = items;
}
}
public class NPCFieldUpdater implements FieldUpdateListener {