diff --git a/pom.xml b/pom.xml
index 85dbb36..8fb8477 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.extio
game-engine
- 1.0.2
+ 1.0.3
25
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelDarkThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelDarkThemeFactoryBean.java
index 248a0e4..86b5020 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelDarkThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelDarkThemeFactoryBean.java
@@ -24,15 +24,15 @@ public class BevelDarkThemeFactoryBean implements FactoryBean {
// Selected Background (Dark Blue)
.backgroundSelected(new HSBColor(0.6f, 0.8f, 0.4f))
// Text (White)
- .textNormal(new HSBColor(0.0f, 0.0f, 0.9f))
+ .textNormal(new HSBColor(0.0f, 0.0f, 0.85f))
// Text Disabled (Grey)
.textDisabled(new HSBColor(0.0f, 0.0f, 0.5f))
// Selection Primary (Dark Blue)
- .selectionPrimary(new HSBColor(0.6f, 0.2f, 0.4f))
+ .selectionPrimary(new HSBColor(0.6f, 0.2f, 0.5f))
// Selection Secondary (Darker Blue)
.selectionSecondary(new HSBColor(0.6f, 0.1f, 0.3f))
// Window Background (Dark Grey)
- .windowBackground(new HSBColor(0.0f, 0.0f, 0.25f))
+ .windowBackground(new HSBColor(0.0f, 0.0f, 0.15f))
.hoverBrightnessAdjustment(0.1f)
.pressedBrightnessAdjustment(0.2f)
.build();
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelLightThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelLightThemeFactoryBean.java
index 941431c..5713e75 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelLightThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BevelLightThemeFactoryBean.java
@@ -24,7 +24,7 @@ public class BevelLightThemeFactoryBean implements FactoryBean {
// Selected Background (Blueish)
.backgroundSelected(new HSBColor(0.6f, 0.5f, 0.9f))
// Text (Black)
- .textNormal(new HSBColor(0.0f, 0.0f, 0.05f))
+ .textNormal(new HSBColor(0.0f, 0.0f, 0.0f))
// Text Disabled (Grey)
.textDisabled(new HSBColor(0.0f, 0.0f, 0.5f))
// Selection Primary (Blue)
@@ -32,7 +32,7 @@ public class BevelLightThemeFactoryBean implements FactoryBean {
// Selection Secondary (Lighter Blue)
.selectionSecondary(new HSBColor(0.6f, 0.15f, 0.4f))
// Window Background (Light Grey)
- .windowBackground(new HSBColor(0.0f, 0.0f, 0.55f))
+ .windowBackground(new HSBColor(0.0f, 0.0f, 0.5f))
.hoverBrightnessAdjustment(0.1f)
.pressedBrightnessAdjustment(0.2f)
.build();
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BlueprintThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BlueprintThemeFactoryBean.java
index 4c06493..658d6c1 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/BlueprintThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/BlueprintThemeFactoryBean.java
@@ -24,7 +24,7 @@ public class BlueprintThemeFactoryBean implements FactoryBean {
// Selected Background (Lighter Blue)
.backgroundSelected(new HSBColor(0.62f, 0.70f, 0.60f))
// Text (White)
- .textNormal(new HSBColor(0.0f, 0.0f, 1.0f))
+ .textNormal(new HSBColor(0.0f, 0.0f, 0.85f))
// Text Disabled (Light Blue)
.textDisabled(new HSBColor(0.6f, 0.3f, 0.7f))
// Selection Primary (Cyan)
@@ -32,7 +32,7 @@ public class BlueprintThemeFactoryBean implements FactoryBean {
// Selection Secondary (White)
.selectionSecondary(new HSBColor(0.0f, 0.0f, 1.0f))
// Window Background (Deep Blueprint Blue)
- .windowBackground(new HSBColor(0.62f, 0.90f, 0.40f))
+ .windowBackground(new HSBColor(0.62f, 0.90f, 0.30f))
.hoverBrightnessAdjustment(0.15f)
.pressedBrightnessAdjustment(0.30f)
.build();
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChroniclePatternRenderer.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChroniclePatternRenderer.java
index faadcd6..bd81be2 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChroniclePatternRenderer.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChroniclePatternRenderer.java
@@ -16,10 +16,6 @@ public class ChroniclePatternRenderer implements PatternRenderer {
@Override
public void drawDecorativeBorder(final Graphics2D g2d, final int x, final int y, final int width, final int height, final int strength, final Color color) {
- drawDecorativeBorder(g2d, x, y, width, height, strength, color, true);
- }
-
- private void drawDecorativeBorder(final Graphics2D g2d, final int x, final int y, final int width, final int height, final int strength, final Color color, final boolean extraDecoration) {
final int s = Math.max(1, strength);
final int arc = Math.max(10, s * 8);
@@ -30,17 +26,6 @@ public class ChroniclePatternRenderer implements PatternRenderer {
g2d.setColor(color);
g2d.setStroke(new BasicStroke(Math.max(1, s), BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
g2d.drawRoundRect(x, y, Math.max(0, width - 1), Math.max(0, height - 1), arc, arc);
-
- if (extraDecoration) {
- final int curl = Math.max(6, s * 6);
- final int pad = Math.max(2, s * 2);
- if (width > curl + pad * 2 && height > curl + pad * 2) {
- g2d.drawArc(x + pad, y + pad, curl, curl, 180, 90);
- g2d.drawArc(x + width - pad - curl, y + pad, curl, curl, 270, 90);
- g2d.drawArc(x + pad, y + height - pad - curl, curl, curl, 90, 90);
- g2d.drawArc(x + width - pad - curl, y + height - pad - curl, curl, curl, 0, 90);
- }
- }
}
finally {
g2d.setStroke(strokeOld);
@@ -88,8 +73,8 @@ public class ChroniclePatternRenderer implements PatternRenderer {
}
}
- this.drawDecorativeBorder(g2d, x + s, y + s, width - s2, height - s2, s, outerBorderColor, false);
- this.drawDecorativeBorder(g2d, x, y, width, height, s, innerBorderColor, false);
+ this.drawDecorativeBorder(g2d, x + s, y + s, width - s2, height - s2, s, outerBorderColor);
+ this.drawDecorativeBorder(g2d, x, y, width, height, s, innerBorderColor);
}
@Override
@@ -129,7 +114,7 @@ public class ChroniclePatternRenderer implements PatternRenderer {
final int s = Math.max(1, (int) (2 * scaleFactor));
final var border = hovered ? theme.getSelectionPrimary().toColor() : theme.getBorderOuter().toColor();
- this.drawDecorativeBorder(g2d, 0, 0, width, height, s, border, false);
+ this.drawDecorativeBorder(g2d, 0, 0, width, height, s, border);
if (!enabled) {
return;
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChronicleThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChronicleThemeFactoryBean.java
index 31e7a42..e8f5702 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChronicleThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ChronicleThemeFactoryBean.java
@@ -16,13 +16,13 @@ public class ChronicleThemeFactoryBean implements FactoryBean {
.borderOuter(new HSBColor(0.08f, 0.18f, 0.45f))
.borderInner(new HSBColor(0.08f, 0.12f, 0.70f))
.borderInnerDisabled(new HSBColor(0.08f, 0.06f, 0.40f))
- .backgroundNormal(new HSBColor(0.11f, 0.22f, 0.86f))
+ .backgroundNormal(new HSBColor(0.11f, 0.22f, 0.75f))
.backgroundSelected(new HSBColor(0.06f, 0.30f, 0.70f))
- .textNormal(new HSBColor(0.07f, 0.10f, 0.18f))
+ .textNormal(new HSBColor(0.07f, 0.10f, 0.14f))
.textDisabled(new HSBColor(0.07f, 0.08f, 0.35f))
.selectionPrimary(new HSBColor(0.00f, 0.30f, 0.62f))
- .selectionSecondary(new HSBColor(0.12f, 0.20f, 0.95f))
- .windowBackground(new HSBColor(0.11f, 0.18f, 0.78f))
+ .selectionSecondary(new HSBColor(0.12f, 0.20f, 0.85f))
+ .windowBackground(new HSBColor(0.11f, 0.18f, 0.6f))
.hoverBrightnessAdjustment(0.12f)
.pressedBrightnessAdjustment(0.24f)
.build();
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ContemporaryThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ContemporaryThemeFactoryBean.java
index 28e6b90..dc340fe 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ContemporaryThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ContemporaryThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class ContemporaryThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.88f, 0.06f, 0.42f))
.backgroundNormal(new HSBColor(0.92f, 0.55f, 0.22f))
.backgroundSelected(new HSBColor(0.92f, 0.35f, 0.70f))
- .textNormal(new HSBColor(0.08f, 0.04f, 0.94f))
+ .textNormal(new HSBColor(0.08f, 0.04f, 0.84f))
.textDisabled(new HSBColor(0.08f, 0.02f, 0.62f))
.selectionPrimary(new HSBColor(0.92f, 0.35f, 0.70f))
.selectionSecondary(new HSBColor(0.58f, 0.25f, 0.95f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamThemeFactoryBean.java
index b7df0c2..76c90ad 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/DreamThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class DreamThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.74f, 0.10f, 0.35f))
.backgroundNormal(new HSBColor(0.74f, 0.55f, 0.16f))
.backgroundSelected(new HSBColor(0.78f, 0.35f, 0.65f))
- .textNormal(new HSBColor(0.12f, 0.03f, 0.96f))
+ .textNormal(new HSBColor(0.12f, 0.03f, 0.86f))
.textDisabled(new HSBColor(0.12f, 0.02f, 0.70f))
.selectionPrimary(new HSBColor(0.78f, 0.35f, 0.65f))
.selectionSecondary(new HSBColor(0.55f, 0.30f, 0.95f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyThemeFactoryBean.java
index 81e32c2..aa00242 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/FantasyThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class FantasyThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.12f, 0.25f, 0.25f))
.backgroundNormal(new HSBColor(0.32f, 0.60f, 0.22f))
.backgroundSelected(new HSBColor(0.13f, 0.65f, 0.68f))
- .textNormal(new HSBColor(0.12f, 0.10f, 0.96f))
+ .textNormal(new HSBColor(0.12f, 0.10f, 0.86f))
.textDisabled(new HSBColor(0.12f, 0.05f, 0.65f))
.selectionPrimary(new HSBColor(0.13f, 0.65f, 0.70f))
.selectionSecondary(new HSBColor(0.58f, 0.35f, 0.88f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ModernThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ModernThemeFactoryBean.java
index 1225b2d..8bf45c6 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/ModernThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/ModernThemeFactoryBean.java
@@ -13,12 +13,12 @@ public class ModernThemeFactoryBean implements FactoryBean {
.name("Modern")
.font("Inter_24pt-Regular.ttf")
.patternRendererName("modernPatternRenderer")
- .borderOuter(new HSBColor(0.58f, 0.08f, 0.82f))
- .borderInner(new HSBColor(0.58f, 0.10f, 0.92f))
+ .borderOuter(new HSBColor(0.58f, 0.08f, 0.78f))
+ .borderInner(new HSBColor(0.58f, 0.10f, 0.88f))
.borderInnerDisabled(new HSBColor(0.58f, 0.05f, 0.45f))
.backgroundNormal(new HSBColor(0.60f, 0.55f, 0.20f))
.backgroundSelected(new HSBColor(0.14f, 0.20f, 0.78f))
- .textNormal(new HSBColor(0.00f, 0.00f, 0.92f))
+ .textNormal(new HSBColor(0.00f, 0.00f, 0.82f))
.textDisabled(new HSBColor(0.00f, 0.00f, 0.65f))
.selectionPrimary(new HSBColor(0.14f, 0.20f, 0.78f))
.selectionSecondary(new HSBColor(0.50f, 0.20f, 0.98f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/NeonThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/NeonThemeFactoryBean.java
index 6306459..42824fc 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/NeonThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/NeonThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class NeonThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.83f, 0.20f, 0.25f))
.backgroundNormal(new HSBColor(0.74f, 0.80f, 0.09f))
.backgroundSelected(new HSBColor(0.52f, 0.85f, 0.92f))
- .textNormal(new HSBColor(0.00f, 0.00f, 0.98f))
+ .textNormal(new HSBColor(0.00f, 0.00f, 0.85f))
.textDisabled(new HSBColor(0.00f, 0.00f, 0.70f))
.selectionPrimary(new HSBColor(0.52f, 0.85f, 0.92f))
.selectionSecondary(new HSBColor(0.16f, 0.85f, 0.95f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/NoirThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/NoirThemeFactoryBean.java
index e173f36..2c733ad 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/NoirThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/NoirThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class NoirThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.00f, 0.00f, 0.12f))
.backgroundNormal(new HSBColor(0.62f, 0.20f, 0.08f))
.backgroundSelected(new HSBColor(0.12f, 0.15f, 0.85f))
- .textNormal(new HSBColor(0.00f, 0.00f, 0.92f))
+ .textNormal(new HSBColor(0.00f, 0.00f, 0.85f))
.textDisabled(new HSBColor(0.00f, 0.00f, 0.55f))
.selectionPrimary(new HSBColor(0.12f, 0.15f, 0.85f))
.selectionSecondary(new HSBColor(0.58f, 0.12f, 0.75f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/SpacecraftThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/SpacecraftThemeFactoryBean.java
index 5ed704c..807278c 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/SpacecraftThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/SpacecraftThemeFactoryBean.java
@@ -20,7 +20,7 @@ public class SpacecraftThemeFactoryBean implements FactoryBean {
.backgroundSelected(new HSBColor(0.199f, 0.83f, 0.50f))
.textNormal(new HSBColor(0.0f, 0.0f, 0.80f))
.textDisabled(new HSBColor(0.0f, 0.0f, 0.50f))
- .selectionPrimary(new HSBColor(0.199f, 0.83f, 0.50f))
+ .selectionPrimary(new HSBColor(0.5f, 0.83f, 0.7f))
.selectionSecondary(new HSBColor(0.199f, 0.83f, 0.90f))
.windowBackground(new HSBColor(0.71f, 0.6f, 0.05f))
.hoverBrightnessAdjustment(0.25f)
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/SteampunkThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/SteampunkThemeFactoryBean.java
index 460eb92..a98c07f 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/SteampunkThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/SteampunkThemeFactoryBean.java
@@ -18,11 +18,11 @@ public class SteampunkThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.08f, 0.3f, 0.3f))
.backgroundNormal(new HSBColor(0.08f, 0.4f, 0.3f))
.backgroundSelected(new HSBColor(0.12f, 0.6f, 0.7f))
- .textNormal(new HSBColor(0.0f, 0.0f, 0.9f))
+ .textNormal(new HSBColor(0.0f, 0.0f, 0.85f))
.textDisabled(new HSBColor(0.0f, 0.0f, 0.5f))
.selectionPrimary(new HSBColor(0.12f, 0.8f, 0.8f))
.selectionSecondary(new HSBColor(0.08f, 0.6f, 0.5f))
- .windowBackground(new HSBColor(0.08f, 0.3f, 0.4f))
+ .windowBackground(new HSBColor(0.08f, 0.3f, 0.3f))
.hoverBrightnessAdjustment(0.2f)
.pressedBrightnessAdjustment(0.3f)
.build();
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/TerminalThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/TerminalThemeFactoryBean.java
index 71359f8..be72e67 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/TerminalThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/TerminalThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class TerminalThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.10f, 0.15f, 0.25f))
.backgroundNormal(new HSBColor(0.08f, 0.65f, 0.12f))
.backgroundSelected(new HSBColor(0.12f, 0.70f, 0.35f))
- .textNormal(new HSBColor(0.12f, 0.85f, 0.95f))
+ .textNormal(new HSBColor(0.12f, 0.85f, 0.85f))
.textDisabled(new HSBColor(0.12f, 0.45f, 0.60f))
.selectionPrimary(new HSBColor(0.10f, 0.75f, 0.55f))
.selectionSecondary(new HSBColor(0.14f, 0.80f, 0.85f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java
index 33a05aa..f28745f 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/UrbanThemeFactoryBean.java
@@ -18,7 +18,7 @@ public class UrbanThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.58f, 0.04f, 0.22f))
.backgroundNormal(new HSBColor(0.58f, 0.22f, 0.16f))
.backgroundSelected(new HSBColor(0.03f, 0.08f, 0.78f))
- .textNormal(new HSBColor(0.00f, 0.00f, 0.94f))
+ .textNormal(new HSBColor(0.00f, 0.00f, 0.84f))
.textDisabled(new HSBColor(0.00f, 0.00f, 0.62f))
.selectionPrimary(new HSBColor(0.03f, 0.08f, 0.78f))
.selectionSecondary(new HSBColor(0.48f, 0.08f, 0.88f))
diff --git a/src/main/java/de/extio/game_engine/renderer/g2d/theme/VintageThemeFactoryBean.java b/src/main/java/de/extio/game_engine/renderer/g2d/theme/VintageThemeFactoryBean.java
index 89cbdf7..0c286d1 100644
--- a/src/main/java/de/extio/game_engine/renderer/g2d/theme/VintageThemeFactoryBean.java
+++ b/src/main/java/de/extio/game_engine/renderer/g2d/theme/VintageThemeFactoryBean.java
@@ -18,9 +18,9 @@ public class VintageThemeFactoryBean implements FactoryBean {
.borderInnerDisabled(new HSBColor(0.08f, 0.20f, 0.18f))
.backgroundNormal(new HSBColor(0.085f, 0.45f, 0.28f))
.backgroundSelected(new HSBColor(0.11f, 0.55f, 0.55f))
- .textNormal(new HSBColor(0.12f, 0.10f, 0.92f))
+ .textNormal(new HSBColor(0.12f, 0.10f, 0.82f))
.textDisabled(new HSBColor(0.12f, 0.05f, 0.60f))
- .selectionPrimary(new HSBColor(0.98f, 0.55f, 0.60f))
+ .selectionPrimary(new HSBColor(0.15f, 0.55f, 0.60f))
.selectionSecondary(new HSBColor(0.11f, 0.70f, 0.80f))
.windowBackground(new HSBColor(0.08f, 0.60f, 0.12f))
.hoverBrightnessAdjustment(0.15f)