Refactor RendererData and related classes to separate UI and Video options into distinct classes

src/main/java/de/extio/game_engine/renderer/RendererData.java

@@ -2,8 +2,8 @@ package de.extio.game_engine.renderer;
 
 import java.util.function.Consumer;
 
-import de.extio.game_engine.spatial2.model.CoordI2;
+import de.extio.game_engine.renderer.options.UiOptions;
-import de.extio.game_engine.spatial2.model.MutableCoordI2;
+import de.extio.game_engine.renderer.options.VideoOptions;
 
 public class RendererData {
 	
@@ -21,148 +21,6 @@ public class RendererData {
 	
 	private Consumer<Object> eventConsumer;
 	
-	public final class UiOptions {
-		
-		private String backgroundResourceName0 = null;
-		
-		private boolean backgroundScrolling0;
-		
-		private boolean backgroundScrollingReverse0;
-		
-		private boolean backgroundScrolling1;
-		
-		private boolean backgroundScrollingReverse1;
-		
-		private boolean drawFps;
-		
-		private CoordI2 backgroundOffset0 = MutableCoordI2.create();
-		
-		private CoordI2 backgroundOffset1 = MutableCoordI2.create();
-		
-		public UiOptions() {
-			if ("true".equals(System.getProperty("debug"))) {
-				this.drawFps = true;
-			}
-		}
-		
-		public boolean isDrawFps() {
-			return this.drawFps;
-		}
-		
-		public void setDrawFps(final boolean drawFps) {
-			this.drawFps = drawFps;
-		}
-		
-		public String getBackgroundResourceName0() {
-			return this.backgroundResourceName0;
-		}
-		
-		public void setBackgroundResourceName0(final String background0) {
-			this.backgroundResourceName0 = background0;
-		}
-		
-		public boolean isBackgroundScrolling0() {
-			return this.backgroundScrolling0;
-		}
-		
-		public void setBackgroundScrolling0(final boolean backgroundScrolling0) {
-			this.backgroundScrolling0 = backgroundScrolling0;
-		}
-		
-		public boolean isBackgroundScrollingReverse0() {
-			return this.backgroundScrollingReverse0;
-		}
-		
-		public void setBackgroundScrollingReverse0(final boolean backgroundScrollingReverse0) {
-			this.backgroundScrollingReverse0 = backgroundScrollingReverse0;
-		}
-		
-		public boolean isBackgroundScrolling1() {
-			return this.backgroundScrolling1;
-		}
-		
-		public void setBackgroundScrolling1(final boolean backgroundScrolling1) {
-			this.backgroundScrolling1 = backgroundScrolling1;
-		}
-		
-		public boolean isBackgroundScrollingReverse1() {
-			return this.backgroundScrollingReverse1;
-		}
-		
-		public void setBackgroundScrollingReverse1(final boolean backgroundScrollingReverse1) {
-			this.backgroundScrollingReverse1 = backgroundScrollingReverse1;
-		}
-		
-		public CoordI2 getBackgroundOffset0() {
-			return this.backgroundOffset0;
-		}
-		
-		public void setBackgroundOffset0(final CoordI2 backgroundOffset0) {
-			this.backgroundOffset0 = backgroundOffset0;
-		}
-		
-		public CoordI2 getBackgroundOffset1() {
-			return this.backgroundOffset1;
-		}
-		
-		public void setBackgroundOffset1(final CoordI2 backgroundOffset1) {
-			this.backgroundOffset1 = backgroundOffset1;
-		}
-		
-	}
-	
-	public final class VideoOptions {
-		
-		private VideoOptionsVideoMode videoMode = VideoOptionsVideoMode.BORDERLESS;
-		
-		private int fullScreenNumber = -1;
-		
-		private double scaleFactorModifier = 1.0;
-		
-		private int frameRateTarget = 60;
-		
-		public double getScaleFactorModifier() {
-			return this.scaleFactorModifier;
-		}
-		
-		public void setScaleFactorModifier(final double scaleFactorModifier) {
-			this.scaleFactorModifier = scaleFactorModifier;
-		}
-		
-		public VideoOptionsVideoMode getVideoMode() {
-			return this.videoMode;
-		}
-		
-		public void setVideoMode(final VideoOptionsVideoMode videoMode) {
-			this.videoMode = videoMode;
-		}
-		
-		public int getFullScreenNumber() {
-			return this.fullScreenNumber;
-		}
-		
-		public void setFullScreenNumber(final int fullScreenNumber) {
-			this.fullScreenNumber = fullScreenNumber;
-		}
-		
-		public int getFrameRateTarget() {
-			return this.frameRateTarget;
-		}
-		
-		public void setFrameRateTarget(final int frameRateTarget) {
-			this.frameRateTarget = frameRateTarget;
-		}
-		
-		public static enum VideoOptionsVideoMode {
-			
-			WINDOW,
-			BORDERLESS,
-			FULLSCREEN
-		
-		}
-		
-	}
-	
 	public RendererControl getRendererControl() {
 		return this.rendererControl;
 	}

src/main/java/de/extio/game_engine/renderer/container/ScrollBar.java

@@ -9,9 +9,9 @@ import org.slf4j.LoggerFactory;
 import de.extio.game_engine.renderer.RenderingBoPool;
 import de.extio.game_engine.renderer.model.RenderingBo;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.SliderControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 import de.extio.game_engine.spatial2.model.Area2;
 import de.extio.game_engine.spatial2.model.CoordI2;

src/main/java/de/extio/game_engine/renderer/container/Window.java

@@ -12,9 +12,9 @@ import de.extio.game_engine.renderer.RendererControl;
 import de.extio.game_engine.renderer.RenderingBoPool;
 import de.extio.game_engine.renderer.model.RenderingBo;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.WindowCloseButtonControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo;
 import de.extio.game_engine.spatial2.WorldUtils2;
 import de.extio.game_engine.spatial2.model.Area2;

src/main/java/de/extio/game_engine/renderer/g2d/G2DRenderer.java

@@ -32,13 +32,13 @@ import de.extio.game_engine.renderer.g2d.control.G2DDrawControl;
 import de.extio.game_engine.renderer.g2d.control.G2DDrawControlTooltip;
 import de.extio.game_engine.renderer.model.RenderingBo;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo;
 import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBo;
 import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBo;
 import de.extio.game_engine.renderer.model.bo.DrawImageRenderingBo;
 import de.extio.game_engine.renderer.model.bo.DrawTestRenderingBo;
 import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.TakeScreenshotEvent;
 import de.extio.game_engine.util.RingBuffer;
 

src/main/java/de/extio/game_engine/renderer/g2d/G2DRendererControl.java

@@ -9,7 +9,7 @@ import org.slf4j.LoggerFactory;
 
 import de.extio.game_engine.renderer.RendererControl;
 import de.extio.game_engine.renderer.RendererData;
-import de.extio.game_engine.renderer.RendererData.VideoOptions.VideoOptionsVideoMode;
+import de.extio.game_engine.renderer.options.VideoOptions.VideoOptionsVideoMode;
 import de.extio.game_engine.spatial2.model.CoordI2;
 import de.extio.game_engine.spatial2.model.ImmutableCoordI2;
 

src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawBackground.java

@@ -15,9 +15,9 @@ import java.util.Objects;
 import javax.imageio.ImageIO;
 
 import de.extio.game_engine.renderer.g2d.G2DRendererControl;
-import de.extio.game_engine.renderer.model.ImmutableRgbaColor;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
+import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.spatial2.model.CoordI2;
 import de.extio.game_engine.spatial2.model.ImmutableCoordI2;
 import de.extio.game_engine.spatial2.model.MutableCoordI2;

src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawEffect.java

@@ -8,9 +8,9 @@ import java.util.List;
 
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport;
-import de.extio.game_engine.renderer.model.DrawEffectRenderingBoEffects;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
 import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBo;
+import de.extio.game_engine.renderer.model.bo.DrawEffectRenderingBoEffects;
 import de.extio.game_engine.spatial2.WorldUtils2;
 import de.extio.game_engine.spatial2.model.Area2;
 import de.extio.game_engine.spatial2.model.CoordI2;

src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawFont.java

@@ -8,9 +8,9 @@ import java.awt.font.TextAttribute;
 import java.util.HashMap;
 import java.util.Map;
 
-import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
 import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBo;
+import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment;
 import de.extio.game_engine.spatial2.model.CoordI2;
 import de.extio.game_engine.spatial2.model.ImmutableCoordI2;
 import de.extio.game_engine.spatial2.model.MutableCoordI2;

src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow.java

@@ -3,10 +3,10 @@ package de.extio.game_engine.renderer.g2d.bo.rendering;
 import java.awt.Graphics2D;
 
 import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport;
-import de.extio.game_engine.renderer.model.ImmutableRgbaColor;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo;
+import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 
 public class G2DDrawWindow extends G2DAbstractRenderingBo implements DrawWindowRenderingBo {
 	

src/main/java/de/extio/game_engine/renderer/g2d/bo/rendering/G2DDrawWindow2.java

@@ -9,10 +9,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
-import de.extio.game_engine.renderer.model.ImmutableRgbaColor;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.DrawWindowRenderingBo;
+import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 
 public class G2DDrawWindow2 extends G2DAbstractRenderingBo implements DrawWindowRenderingBo {
 	

src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControl.java

@@ -21,10 +21,10 @@ import de.extio.game_engine.renderer.g2d.control.impl.G2DTextfieldControlImpl2;
 import de.extio.game_engine.renderer.g2d.control.impl.G2DToggleButtonControlImpl;
 import de.extio.game_engine.renderer.g2d.control.impl.G2DTooltipControl;
 import de.extio.game_engine.renderer.g2d.control.impl.G2DWindowCloseButtonControlImpl;
-import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo;
+import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 
 public class G2DDrawControl extends G2DAbstractRenderingBo implements ControlRenderingBo {
 	

src/main/java/de/extio/game_engine/renderer/g2d/control/G2DDrawControlTooltip.java

@@ -5,8 +5,8 @@ import java.awt.Graphics2D;
 
 import de.extio.game_engine.renderer.g2d.bo.rendering.G2DAbstractRenderingBo;
 import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
-import de.extio.game_engine.renderer.model.MutableRgbaColor;
 import de.extio.game_engine.renderer.model.RenderingBoLayer;
+import de.extio.game_engine.renderer.model.color.MutableRgbaColor;
 import de.extio.game_engine.spatial2.model.CoordI2;
 
 public class G2DDrawControlTooltip extends G2DAbstractRenderingBo {

src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomJTextField.java

@@ -9,8 +9,8 @@ import javax.swing.text.BadLocationException;
 import javax.swing.text.Position.Bias;
 
 import de.extio.game_engine.renderer.g2d.control.G2DControlHasExclusiveKeyEvent;
-import de.extio.game_engine.renderer.model.ImmutableRgbaColor;
+import de.extio.game_engine.renderer.model.color.ImmutableRgbaColor;
-import de.extio.game_engine.renderer.model.RgbaColor;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 
 @SuppressWarnings("serial")
 public class CustomJTextField extends JTextField implements G2DControlHasExclusiveKeyEvent {

src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomLabel.java

@@ -11,7 +11,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
 
 import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
-import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment;
+import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment;
 import de.extio.game_engine.spatial2.model.CoordI2;
 import de.extio.game_engine.spatial2.model.ImmutableCoordI2;
 

src/main/java/de/extio/game_engine/renderer/g2d/control/components/CustomWindowCloseButton.java

@@ -6,7 +6,7 @@ import java.awt.Graphics2D;
 import java.awt.event.ActionListener;
 
 import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
-import de.extio.game_engine.renderer.model.RgbaColor;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 
 @SuppressWarnings("serial")
 public class CustomWindowCloseButton extends CustomAbstractButton {

src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DButtonControlImpl.java

@@ -5,9 +5,9 @@ import java.util.Objects;
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.control.components.CustomAbstractButton;
 import de.extio.game_engine.renderer.g2d.control.components.CustomButton;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.ButtonControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 
 public class G2DButtonControlImpl extends G2DBaseControlImpl implements ButtonControl {

src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DLabelControlImpl.java

@@ -2,9 +2,9 @@ package de.extio.game_engine.renderer.g2d.control.impl;
 
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.control.components.CustomLabel;
-import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment;
+import de.extio.game_engine.renderer.model.bo.DrawFontRenderingBoTextAlignment;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.LabelControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 
 public class G2DLabelControlImpl extends G2DBaseControlImpl implements LabelControl {

src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DSliderControlImpl.java

@@ -4,8 +4,8 @@ import java.util.function.Consumer;
 
 import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.control.components.CustomSlider;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.SliderControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 
 public class G2DSliderControlImpl extends G2DBaseControlImpl implements SliderControl {

src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTableControlImpl.java

@@ -20,9 +20,9 @@ import de.extio.game_engine.renderer.g2d.G2DRenderer;
 import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
 import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport;
 import de.extio.game_engine.renderer.g2d.control.components.CustomTable;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.TableControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 import de.extio.game_engine.spatial2.model.ImmutableCoordI2;
 

src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl.java

@@ -11,9 +11,9 @@ import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
 import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport;
 import de.extio.game_engine.renderer.g2d.control.components.CustomTextArea;
 import de.extio.game_engine.renderer.g2d.control.components.CustomTextField;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.TextfieldControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 
 public class G2DTextfieldControlImpl extends G2DBaseControlImpl implements TextfieldControl {

src/main/java/de/extio/game_engine/renderer/g2d/control/impl/G2DTextfieldControlImpl2.java

@@ -14,9 +14,9 @@ import de.extio.game_engine.renderer.g2d.bo.rendering.G2DDrawFont;
 import de.extio.game_engine.renderer.g2d.control.components.ComponentRenderingSupport;
 import de.extio.game_engine.renderer.g2d.control.components.CustomJTextArea;
 import de.extio.game_engine.renderer.g2d.control.components.CustomJTextField;
-import de.extio.game_engine.renderer.model.RgbaColor;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.BaseControl;
 import de.extio.game_engine.renderer.model.bo.ControlRenderingBo.TextfieldControl;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.renderer.model.event.UiControlEvent;
 
 public class G2DTextfieldControlImpl2 extends G2DBaseControlImpl implements TextfieldControl {

src/main/java/de/extio/game_engine/renderer/model/AbstractRenderingBo.java

@@ -4,6 +4,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import de.extio.game_engine.renderer.RendererData;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.spatial2.model.HasPosition2;
 
 public abstract class AbstractRenderingBo implements RenderingBo {

src/main/java/de/extio/game_engine/renderer/model/RenderingBo.java

@@ -1,6 +1,7 @@
 package de.extio.game_engine.renderer.model;
 
 import de.extio.game_engine.renderer.RendererData;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 import de.extio.game_engine.spatial2.model.HasPosition2;
 
 /**

src/main/java/de/extio/game_engine/renderer/model/bo/ControlRenderingBo.java

@@ -3,9 +3,8 @@ package de.extio.game_engine.renderer.model.bo;
 import java.util.List;
 
 import de.extio.game_engine.renderer.RendererData;
-import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment;
 import de.extio.game_engine.renderer.model.RenderingBoHasDimension;
-import de.extio.game_engine.renderer.model.RgbaColor;
+import de.extio.game_engine.renderer.model.color.RgbaColor;
 
 /**
  * This bo renders ui controls (buttons, ...)

src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBo.java

@@ -2,7 +2,6 @@ package de.extio.game_engine.renderer.model.bo;
 
 import java.util.List;
 
-import de.extio.game_engine.renderer.model.DrawEffectRenderingBoEffects;
 import de.extio.game_engine.renderer.model.RenderingBo;
 import de.extio.game_engine.spatial2.model.CoordI2;
 

src/main/java/de/extio/game_engine/renderer/model/bo/DrawEffectRenderingBoEffects.java

@@ -1,4 +1,4 @@
-package de.extio.game_engine.renderer.model;
+package de.extio.game_engine.renderer.model.bo;
 
 public enum DrawEffectRenderingBoEffects {
 	

src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBo.java

@@ -1,6 +1,5 @@
 package de.extio.game_engine.renderer.model.bo;
 
-import de.extio.game_engine.renderer.model.DrawFontRenderingBoTextAlignment;
 import de.extio.game_engine.renderer.model.RenderingBoHasDimension;
 
 /**

src/main/java/de/extio/game_engine/renderer/model/bo/DrawFontRenderingBoTextAlignment.java

@@ -1,4 +1,4 @@
-package de.extio.game_engine.renderer.model;
+package de.extio.game_engine.renderer.model.bo;
 
 public enum DrawFontRenderingBoTextAlignment {
 	

src/main/java/de/extio/game_engine/renderer/model/color/ImmutableRgbaColor.java

@@ -1,4 +1,4 @@
-package de.extio.game_engine.renderer.model;
+package de.extio.game_engine.renderer.model.color;
 
 import java.awt.Color;
 import java.util.Objects;

src/main/java/de/extio/game_engine/renderer/model/color/MutableRgbaColor.java

@@ -1,4 +1,4 @@
-package de.extio.game_engine.renderer.model;
+package de.extio.game_engine.renderer.model.color;
 
 import java.awt.Color;
 import java.util.Objects;

src/main/java/de/extio/game_engine/renderer/model/color/RgbaColor.java

@@ -1,4 +1,4 @@
-package de.extio.game_engine.renderer.model;
+package de.extio.game_engine.renderer.model.color;
 
 import java.awt.Color;
 

src/main/java/de/extio/game_engine/renderer/options/UiOptions.java

@@ -1,15 +1,10 @@
-package de.extio.game_engine.renderer;
+package de.extio.game_engine.renderer.options;
 
 import de.extio.game_engine.spatial2.model.CoordI2;
 import de.extio.game_engine.spatial2.model.MutableCoordI2;
 
-/**
- * General options for the client UI
- */
 public final class UiOptions {
 		
-	private String backgroundResourceModName0 = null;
-	
 	private String backgroundResourceName0 = null;
 	
 	private boolean backgroundScrolling0;
@@ -96,12 +91,4 @@ public final class UiOptions {
 		this.backgroundOffset1 = backgroundOffset1;
 	}
 	
-	public String getBackgroundResourceModName0() {
-		return this.backgroundResourceModName0;
-	}
-	
-	public void setBackgroundResourceModName0(final String backgroundResourceModName0) {
-		this.backgroundResourceModName0 = backgroundResourceModName0;
-	}
-	
 }

src/main/java/de/extio/game_engine/renderer/options/VideoOptions.java

@@ -0,0 +1,53 @@
+package de.extio.game_engine.renderer.options;
+
+public final class VideoOptions {
+	
+	private VideoOptionsVideoMode videoMode = VideoOptionsVideoMode.BORDERLESS;
+	
+	private int fullScreenNumber = -1;
+	
+	private double scaleFactorModifier = 1.0;
+	
+	private int frameRateTarget = 60;
+	
+	public double getScaleFactorModifier() {
+		return this.scaleFactorModifier;
+	}
+	
+	public void setScaleFactorModifier(final double scaleFactorModifier) {
+		this.scaleFactorModifier = scaleFactorModifier;
+	}
+	
+	public VideoOptionsVideoMode getVideoMode() {
+		return this.videoMode;
+	}
+	
+	public void setVideoMode(final VideoOptionsVideoMode videoMode) {
+		this.videoMode = videoMode;
+	}
+	
+	public int getFullScreenNumber() {
+		return this.fullScreenNumber;
+	}
+	
+	public void setFullScreenNumber(final int fullScreenNumber) {
+		this.fullScreenNumber = fullScreenNumber;
+	}
+	
+	public int getFrameRateTarget() {
+		return this.frameRateTarget;
+	}
+	
+	public void setFrameRateTarget(final int frameRateTarget) {
+		this.frameRateTarget = frameRateTarget;
+	}
+	
+	public static enum VideoOptionsVideoMode {
+		
+		WINDOW,
+		BORDERLESS,
+		FULLSCREEN
+	
+	}
+	
+}