Update schema with the last modifications of gui_rw_test2 commit

guicore/src/main/java/org/scaminc/minefork/guicore/NBTWriter.java

@@ -8,8 +8,10 @@ public class NBTWriter {
     {
         NBTOutput out = new NBTOutput();
 
-        out.put(NBTTags.IsInGame.value(), scr.IsInGame);
+        if (scr.IsPanorama != null)
             out.put(NBTTags.IsPanorama.value(), scr.IsPanorama);
+        if (scr.Background != null)
+            out.put(NBTTags.Background.value(), scr.Background);
 
         if (!scr.Children.isEmpty())
         {

guicore/src/main/java/org/scaminc/minefork/guicore/XMLReader.java

@@ -38,16 +38,18 @@ public class XMLReader {
 
         Node scrXml = nodes.item(0);
 
-        Node panorama = scrXml.getAttributes().getNamedItem("panorama");
-        if (panorama == null)
-            return null;
-        Node ingame = scrXml.getAttributes().getNamedItem("ingame");
-        if (ingame == null)
-            return null;
-
         Screen scr = new Screen();
-        scr.IsInGame = Boolean.parseBoolean(ingame.getNodeValue());
+
-        scr.IsPanorama = Boolean.parseBoolean(panorama.getNodeValue());
+        NamedNodeMap attrs = scrXml.getAttributes();
+        for (int i = 0; i < attrs.getLength(); i++)
+        {
+            Node attr = attrs.item(i);
+            switch (attr.getNodeName())
+            {
+                case "panorama" -> scr.IsPanorama = Boolean.parseBoolean(attr.getNodeValue());
+                case "background" -> scr.Background = Integer.parseInt(attr.getNodeValue());
+            }
+        }
 
         NodeList children = scrXml.getChildNodes();
         int childrenlen = children.getLength();

guicore/src/main/java/org/scaminc/minefork/guicore/entity/Screen.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Screen {
-    public boolean IsPanorama = false;
+    public Boolean IsPanorama = null;
-    public boolean IsInGame = false;
+    public Integer Background = null;
     public List<BaseGui> Children = new ArrayList<>();
 }

guicore/src/main/java/org/scaminc/minefork/guicore/nbt/NBTTags.java

@@ -14,9 +14,9 @@ public enum NBTTags {
 	AnchorX,
 	AnchorY,
 	// Screen tags
-	IsInGame,
 	IsPanorama,
 	Childs,
+	Background,
 	// Label tags
 	Rotation,
 	Scale,
@@ -36,6 +36,7 @@ public enum NBTTags {
 	DrawRight,
 	DrawTop,
 	DrawBottom;
+	// end of Version 1 tags
 
 	public String value()
 	{

guicore/src/main/xsd/GuiScreen.xsd

@@ -117,7 +117,7 @@
                 </xs:element>
             </xs:sequence>
             <xs:attribute name="panorama" type="xs:boolean" default="false" />
-            <xs:attribute name="ingame" type="xs:boolean" default="false" />
+            <xs:attribute name="background" type="xs:integer" />
         </xs:complexType>
     </xs:element>
 </xs:schema>