Fix textures in jar.

Normand Briere

2019-08-15 24a2a946b35279605e645349bd6b82e9e60aac88

Fix textures in jar.

 Dreams&Reality/icons/A Fairytale.jpg
deleted file mode 100644Binary files differ
 Dreams&Reality/icons/Atlantica.jpg
deleted file mode 100644Binary files differ
 Dreams&Reality/icons/Lost.jpg
deleted file mode 100644Binary files differ
 Dreams&Reality/icons/Ruins Of Atlantis.jpg
deleted file mode 100644Binary files differ
 Dreams&Reality/icons/The Darkness.jpg
deleted file mode 100644Binary files differ
 Dreams&Reality/icons/The Mediterranean.jpg
deleted file mode 100644Binary files differ
 Grafreed.java
..
..
@@ -955,6 +955,8 @@
955
955
             java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
956
956
 
957
957
             readobj = (Object3D) p.readObject();
958
+            p.close();
959
+            zstream.close();
958
960
             istream.close();
959
961
 
960
962
             readobj.ResetDisplayList();
..
..
@@ -968,6 +970,7 @@
968
970
                 java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
969
971
 
970
972
                 readobj = (Object3D) p.readObject();
973
+                p.close();
971
974
                 istream.close();
972
975
 
973
976
                 readobj.ResetDisplayList();
 GroupEditor.java
..
..
@@ -928,7 +928,7 @@
928
928
 	
929
929
         JTabbedPane resourcecontainer;
930
930
         cGridBag currenttab;
931
-        boolean added; // patch for jar
931
+        //boolean added; // patch for jar
932
932
                 
933
933
         int tabcount = 0;
934
934
         int colcount = 0;
..
..
@@ -940,17 +940,19 @@
940
940
         
941
941
     public void ResourceCallBack(String[] path)
942
942
     {
943
-        for (int i = 0; i < path.length; i++)
944
-            System.out.print(path[i] + "/");
945
-        System.out.println();
943
+//        for (int i = 0; i < path.length; i++)
944
+//            System.out.print(path[i] + "/");
945
+//        System.out.println();
946
946
         
947
947
         if (//rowcount == 0 ||
948
-                path.length == 1)
948
+                path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
949
949
         {
950
950
             currenttab = new cGridBag();
951
-            added = false;
952
951
             String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
953
952
             currenttab.setName(tabname);
953
+            //added = false;
954
+            resourcecontainer.add(currenttab);
955
+            resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
954
956
             rowcount = 1;
955
957
             colcount = 0;
956
958
             texturecount = 0;
..
..
@@ -958,12 +960,11 @@
958
960
         
959
961
         if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
960
962
         {
961
-            if (!added)
963
+            //if (!added)
962
964
             {
963
-                added = true;
964
-                resourcecontainer.add(currenttab);
965
+                //added = true;
965
966
                 String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
966
-                resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
967
+                currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
967
968
             }
968
969
             
969
970
             AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
 ObjEditor.java
..
..
@@ -1789,7 +1789,7 @@
1789
1789
 
1790
1790
         frame.getContentPane().setLayout(new BorderLayout());
1791
1791
         /**/
1792
-        JTabbedPane worldPane = new JTabbedPane();
1792
+        //JTabbedPane worldPane = new JTabbedPane();
1793
1793
         //worldPane.add(bigPanel);
1794
1794
         //worldPane.add(worldPanel);
1795
1795
                 /**/
..
..
@@ -5550,7 +5550,7 @@
5550
5550
             copy.versionlist = new Object3D[100];
5551
5551
             copy.versionindex = -1;
5552
5552
             
5553
-            Save(true);
5553
+            //Save(true);
5554
5554
         }
5555
5555
         
5556
5556
             //? SetUndoStates();
 Wav.java
..
..
@@ -109,7 +109,7 @@
109
109
     
110
110
     static int minutes = 10;
111
111
     
112
-    static byte[] theStream = new byte[44100*2 * 60 * minutes];
112
+    static byte[] theStream = new byte[0]; // 44100*2 * 60 * minutes];
113
113
     
114
114
     static int cursor = 0; // +735 per frame = 44100 Hz / 120 Hz * 2 (for 16 bits)
115
115
 
 Dreams&Reality/A Fairytale.jpg
similarity index 100%rename from Dreams&Reality/A Fairytale.jpgrename to textures/D&R/Dreams&Reality/A Fairytale.jpgBinary files differ
 Dreams&Reality/Ancient.jpg
similarity index 100%rename from Dreams&Reality/Ancient.jpgrename to textures/D&R/Dreams&Reality/Ancient.jpgBinary files differ
 Dreams&Reality/Araenia Rising.jpg
similarity index 100%rename from Dreams&Reality/Araenia Rising.jpgrename to textures/D&R/Dreams&Reality/Araenia Rising.jpgBinary files differ
 Dreams&Reality/Atlantica.jpg
similarity index 100%rename from Dreams&Reality/Atlantica.jpgrename to textures/D&R/Dreams&Reality/Atlantica.jpgBinary files differ
 Dreams&Reality/Aztec Sun.jpg
similarity index 100%rename from Dreams&Reality/Aztec Sun.jpgrename to textures/D&R/Dreams&Reality/Aztec Sun.jpgBinary files differ
 Dreams&Reality/Cold December.jpg
similarity index 100%rename from Dreams&Reality/Cold December.jpgrename to textures/D&R/Dreams&Reality/Cold December.jpgBinary files differ
 Dreams&Reality/Dream Castle.jpg
similarity index 100%rename from Dreams&Reality/Dream Castle.jpgrename to textures/D&R/Dreams&Reality/Dream Castle.jpgBinary files differ
 Dreams&Reality/Emerald Jungle.jpg
similarity index 100%rename from Dreams&Reality/Emerald Jungle.jpgrename to textures/D&R/Dreams&Reality/Emerald Jungle.jpgBinary files differ
 Dreams&Reality/Enchantment.jpg
similarity index 100%rename from Dreams&Reality/Enchantment.jpgrename to textures/D&R/Dreams&Reality/Enchantment.jpgBinary files differ
 Dreams&Reality/Forbidden Forest.jpg
similarity index 100%rename from Dreams&Reality/Forbidden Forest.jpgrename to textures/D&R/Dreams&Reality/Forbidden Forest.jpgBinary files differ
 Dreams&Reality/Haunted.jpg
similarity index 100%rename from Dreams&Reality/Haunted.jpgrename to textures/D&R/Dreams&Reality/Haunted.jpgBinary files differ
 Dreams&Reality/Island Getaway.jpg
similarity index 100%rename from Dreams&Reality/Island Getaway.jpgrename to textures/D&R/Dreams&Reality/Island Getaway.jpgBinary files differ
 Dreams&Reality/Lost.jpg
similarity index 100%rename from Dreams&Reality/Lost.jpgrename to textures/D&R/Dreams&Reality/Lost.jpgBinary files differ
 Dreams&Reality/Mount Olympus.jpg
similarity index 100%rename from Dreams&Reality/Mount Olympus.jpgrename to textures/D&R/Dreams&Reality/Mount Olympus.jpgBinary files differ
 Dreams&Reality/Prehistoria.jpg
similarity index 100%rename from Dreams&Reality/Prehistoria.jpgrename to textures/D&R/Dreams&Reality/Prehistoria.jpgBinary files differ
 Dreams&Reality/Purple Peace.jpg
similarity index 100%rename from Dreams&Reality/Purple Peace.jpgrename to textures/D&R/Dreams&Reality/Purple Peace.jpgBinary files differ
 Dreams&Reality/Realm Of Fire.jpg
similarity index 100%rename from Dreams&Reality/Realm Of Fire.jpgrename to textures/D&R/Dreams&Reality/Realm Of Fire.jpgBinary files differ
 Dreams&Reality/Ruined.jpg
similarity index 100%rename from Dreams&Reality/Ruined.jpgrename to textures/D&R/Dreams&Reality/Ruined.jpgBinary files differ
 Dreams&Reality/Ruins Of Atlantis.jpg
similarity index 100%rename from Dreams&Reality/Ruins Of Atlantis.jpgrename to textures/D&R/Dreams&Reality/Ruins Of Atlantis.jpgBinary files differ
 Dreams&Reality/Safe Haven.jpg
similarity index 100%rename from Dreams&Reality/Safe Haven.jpgrename to textures/D&R/Dreams&Reality/Safe Haven.jpgBinary files differ
 Dreams&Reality/Saigon Sunset.jpg
similarity index 100%rename from Dreams&Reality/Saigon Sunset.jpgrename to textures/D&R/Dreams&Reality/Saigon Sunset.jpgBinary files differ
 Dreams&Reality/Solitary.jpg
similarity index 100%rename from Dreams&Reality/Solitary.jpgrename to textures/D&R/Dreams&Reality/Solitary.jpgBinary files differ
 Dreams&Reality/Something Like Paradise.jpg
similarity index 100%rename from Dreams&Reality/Something Like Paradise.jpgrename to textures/D&R/Dreams&Reality/Something Like Paradise.jpgBinary files differ
 Dreams&Reality/Sun Touched.jpg
similarity index 100%rename from Dreams&Reality/Sun Touched.jpgrename to textures/D&R/Dreams&Reality/Sun Touched.jpgBinary files differ
 Dreams&Reality/The Clearing.jpg
similarity index 100%rename from Dreams&Reality/The Clearing.jpgrename to textures/D&R/Dreams&Reality/The Clearing.jpgBinary files differ
 Dreams&Reality/The Darkness.jpg
similarity index 100%rename from Dreams&Reality/The Darkness.jpgrename to textures/D&R/Dreams&Reality/The Darkness.jpgBinary files differ
 Dreams&Reality/The Mediterranean.jpg
similarity index 100%rename from Dreams&Reality/The Mediterranean.jpgrename to textures/D&R/Dreams&Reality/The Mediterranean.jpgBinary files differ
 Dreams&Reality/Tranquility.jpg
similarity index 100%rename from Dreams&Reality/Tranquility.jpgrename to textures/D&R/Dreams&Reality/Tranquility.jpgBinary files differ
 Dreams&Reality/Wasteland.jpg
similarity index 100%rename from Dreams&Reality/Wasteland.jpgrename to textures/D&R/Dreams&Reality/Wasteland.jpgBinary files differ
 Dreams&Reality/White Noise.jpg
similarity index 100%rename from Dreams&Reality/White Noise.jpgrename to textures/D&R/Dreams&Reality/White Noise.jpgBinary files differ
 Dreams&Reality/icons/Aztec Sun.jpg
similarity index 79%copy from Dreams&Reality/icons/Aztec Sun.jpgcopy to textures/D&R/Dreams&Reality/icons/A Fairytale.jpgBinary files differ
 Dreams&Reality/icons/Ancient.jpg
similarity index 80%rename from Dreams&Reality/icons/Ancient.jpgrename to textures/D&R/Dreams&Reality/icons/Ancient.jpgBinary files differ
 Dreams&Reality/icons/Araenia Rising.jpg
similarity index 81%rename from Dreams&Reality/icons/Araenia Rising.jpgrename to textures/D&R/Dreams&Reality/icons/Araenia Rising.jpgBinary files differ
 Dreams&Reality/icons/Aztec Sun.jpg
similarity index 82%copy from Dreams&Reality/icons/Aztec Sun.jpgcopy to textures/D&R/Dreams&Reality/icons/Atlantica.jpgBinary files differ
 Dreams&Reality/icons/Aztec Sun.jpg
similarity index 79%copy from Dreams&Reality/icons/Aztec Sun.jpgcopy to textures/D&R/Dreams&Reality/icons/Aztec Sun.jpgBinary files differ
 Dreams&Reality/icons/Cold December.jpg
similarity index 83%rename from Dreams&Reality/icons/Cold December.jpgrename to textures/D&R/Dreams&Reality/icons/Cold December.jpgBinary files differ
 Dreams&Reality/icons/Dream Castle.jpg
similarity index 74%rename from Dreams&Reality/icons/Dream Castle.jpgrename to textures/D&R/Dreams&Reality/icons/Dream Castle.jpgBinary files differ
 Dreams&Reality/icons/Emerald Jungle.jpg
similarity index 80%rename from Dreams&Reality/icons/Emerald Jungle.jpgrename to textures/D&R/Dreams&Reality/icons/Emerald Jungle.jpgBinary files differ
 Dreams&Reality/icons/Enchantment.jpg
similarity index 91%rename from Dreams&Reality/icons/Enchantment.jpgrename to textures/D&R/Dreams&Reality/icons/Enchantment.jpgBinary files differ
 Dreams&Reality/icons/Forbidden Forest.jpg
similarity index 81%rename from Dreams&Reality/icons/Forbidden Forest.jpgrename to textures/D&R/Dreams&Reality/icons/Forbidden Forest.jpgBinary files differ
 Dreams&Reality/icons/Haunted.jpg
similarity index 80%rename from Dreams&Reality/icons/Haunted.jpgrename to textures/D&R/Dreams&Reality/icons/Haunted.jpgBinary files differ
 Dreams&Reality/icons/Island Getaway.jpg
similarity index 78%rename from Dreams&Reality/icons/Island Getaway.jpgrename to textures/D&R/Dreams&Reality/icons/Island Getaway.jpgBinary files differ
 Dreams&Reality/icons/Solitary.jpg
similarity index 92%rename from Dreams&Reality/icons/Solitary.jpgrename to textures/D&R/Dreams&Reality/icons/Lost.jpgBinary files differ
 Dreams&Reality/icons/Mount Olympus.jpg
similarity index 77%rename from Dreams&Reality/icons/Mount Olympus.jpgrename to textures/D&R/Dreams&Reality/icons/Mount Olympus.jpgBinary files differ
 Dreams&Reality/icons/Prehistoria.jpg
similarity index 78%rename from Dreams&Reality/icons/Prehistoria.jpgrename to textures/D&R/Dreams&Reality/icons/Prehistoria.jpgBinary files differ
 Dreams&Reality/icons/Purple Peace.jpg
similarity index 75%rename from Dreams&Reality/icons/Purple Peace.jpgrename to textures/D&R/Dreams&Reality/icons/Purple Peace.jpgBinary files differ
 Dreams&Reality/icons/Realm Of Fire.jpg
similarity index 78%rename from Dreams&Reality/icons/Realm Of Fire.jpgrename to textures/D&R/Dreams&Reality/icons/Realm Of Fire.jpgBinary files differ
 Dreams&Reality/icons/Ruined.jpg
similarity index 77%rename from Dreams&Reality/icons/Ruined.jpgrename to textures/D&R/Dreams&Reality/icons/Ruined.jpgBinary files differ
 Dreams&Reality/icons/Aztec Sun.jpg
similarity index 85%copy from Dreams&Reality/icons/Aztec Sun.jpgcopy to textures/D&R/Dreams&Reality/icons/Ruins Of Atlantis.jpgBinary files differ
 Dreams&Reality/icons/Safe Haven.jpg
similarity index 79%rename from Dreams&Reality/icons/Safe Haven.jpgrename to textures/D&R/Dreams&Reality/icons/Safe Haven.jpgBinary files differ
 Dreams&Reality/icons/Saigon Sunset.jpg
similarity index 81%rename from Dreams&Reality/icons/Saigon Sunset.jpgrename to textures/D&R/Dreams&Reality/icons/Saigon Sunset.jpgBinary files differ
 Dreams&Reality/icons/Solitary.jpg
similarity index 91%copy from Dreams&Reality/icons/Solitary.jpgcopy to textures/D&R/Dreams&Reality/icons/Solitary.jpgBinary files differ
 Dreams&Reality/icons/Something Like Paradise.jpg
similarity index 74%rename from Dreams&Reality/icons/Something Like Paradise.jpgrename to textures/D&R/Dreams&Reality/icons/Something Like Paradise.jpgBinary files differ
 Dreams&Reality/icons/Sun Touched.jpg
similarity index 81%rename from Dreams&Reality/icons/Sun Touched.jpgrename to textures/D&R/Dreams&Reality/icons/Sun Touched.jpgBinary files differ
 Dreams&Reality/icons/The Clearing.jpg
similarity index 91%rename from Dreams&Reality/icons/The Clearing.jpgrename to textures/D&R/Dreams&Reality/icons/The Clearing.jpgBinary files differ
 Dreams&Reality/icons/Aztec Sun.jpg
similarity index 85%rename from Dreams&Reality/icons/Aztec Sun.jpgrename to textures/D&R/Dreams&Reality/icons/The Darkness.jpgBinary files differ
 Dreams&Reality/icons/Solitary.jpg
similarity index 91%copy from Dreams&Reality/icons/Solitary.jpgcopy to textures/D&R/Dreams&Reality/icons/The Mediterranean.jpgBinary files differ
 Dreams&Reality/icons/Tranquility.jpg
similarity index 91%rename from Dreams&Reality/icons/Tranquility.jpgrename to textures/D&R/Dreams&Reality/icons/Tranquility.jpgBinary files differ
 Dreams&Reality/icons/Wasteland.jpg
similarity index 85%rename from Dreams&Reality/icons/Wasteland.jpgrename to textures/D&R/Dreams&Reality/icons/Wasteland.jpgBinary files differ
 Dreams&Reality/icons/White Noise.jpg
similarity index 79%rename from Dreams&Reality/icons/White Noise.jpgrename to textures/D&R/Dreams&Reality/icons/White Noise.jpgBinary files differ