Added Images

Radicalius · Mar 29, 2017 · bdf073e · bdf073e
1 parent e0c96af
commit bdf073e
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 9 deletions.
diff --git a/config/packs b/config/packs
@@ -1,9 +1,9 @@
 Ascii   ascii.png   Ascii.zip   n/a   |
 IronHand    ironhand.jpg    IronHand 0.68.zip   http://dffd.bay12games.com/download.php?id=2511&f=Ironhand+0.68.zip   DF
-Jolly Bastion   n/a   JollyBastion34-10v5.zip   http://www.alexanderocias.com/jollybastion/JollyBastion34-10v5.zip   JollyBastion34-10v5/9x12 (recommended)
-Mayday   n/a   dfg_40_05_win.zip   http://goblinart.pl/upload/DFG/dfg_40_05_win.zip   |
-Obsidian   n/a   [16x16] Obsidian (v.0.8).zip   http://dffd.bay12games.com/download.php?id=7728&f=%5B16x16%5D+Obsidian+%28v.0.8%29.zip   [16x16] Obsidian
-Pheobus   n/a   F_Phoebus_40_24v00.zip   http://dffd.bay12games.com/download.php?id=2431&f=DF_Phoebus_40_24v00.zip   DF_Phoebus_40_24v00
-Spacefox   n/a   spacefox_df42_02_standalone.zip   http://dffd.bay12games.com/download.php?id=11405&f=spacefox_df42_02_standalone.zip   spacefox_df42_02_standalone
+Jolly Bastion   jollybastion.jpg   JollyBastion34-10v5.zip   http://www.alexanderocias.com/jollybastion/JollyBastion34-10v5.zip   JollyBastion34-10v5/9x12 (recommended)
+Mayday   mayday.png   dfg_40_05_win.zip   http://goblinart.pl/upload/DFG/dfg_40_05_win.zip   |
+Obsidian   obsidian.jpg   [16x16] Obsidian (v.0.8).zip   http://dffd.bay12games.com/download.php?id=7728&f=%5B16x16%5D+Obsidian+%28v.0.8%29.zip   [16x16] Obsidian
+Pheobus   pheobus.jpg   F_Phoebus_40_24v00.zip   http://dffd.bay12games.com/download.php?id=2431&f=DF_Phoebus_40_24v00.zip   DF_Phoebus_40_24v00
+Spacefox   spacefox.png   spacefox_df42_02_standalone.zip   http://dffd.bay12games.com/download.php?id=11405&f=spacefox_df42_02_standalone.zip   spacefox_df42_02_standalone
 Taffer's   n/a   taffer-v4.83.zip   https://github.com/nc-z/taffer/archive/v4.83.zip   taffer-4.83/10x
-CLA   n/a    CLA-43.05-v23.zip   https://github.com/DFgraphics/CLA/archive/43.05-v23.zip   CLA-43.05-v23
+CLA   cla.gif    CLA-43.05-v23.zip   https://github.com/DFgraphics/CLA/archive/43.05-v23.zip   CLA-43.05-v23
diff --git a/dflauncher.jar b/dflauncher.jar
diff --git a/out/artifacts/dflauncher_jar/dflauncher.jar b/out/artifacts/dflauncher_jar/dflauncher.jar
diff --git a/out/production/dflauncher/LaunchThread.class b/out/production/dflauncher/LaunchThread.class
diff --git a/out/production/dflauncher/META-INF/MANIFEST.MF b/out/production/dflauncher/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: main
+
diff --git a/out/production/dflauncher/Sampler.class b/out/production/dflauncher/Sampler.class
diff --git a/out/production/dflauncher/main.class b/out/production/dflauncher/main.class
diff --git a/samples/cla.gif b/samples/cla.gif
diff --git a/samples/dwarfsx0.jpg b/samples/dwarfsx0.jpg
diff --git a/samples/jollybastion.jpg b/samples/jollybastion.jpg
diff --git a/samples/mayday.png b/samples/mayday.png
diff --git a/samples/obsidian.jpg b/samples/obsidian.jpg
diff --git a/samples/pheobus.jpg b/samples/pheobus.jpg
diff --git a/samples/spacefox.png b/samples/spacefox.png
diff --git a/src/LaunchThread.java b/src/LaunchThread.java
@@ -41,13 +41,11 @@ public void run(){
             //deleteDirectory(new File(main.install+"\\data"));
             System.out.print(main.install+"\\data");
             ZipFile zf = new ZipFile("packs/"+pack.filename);
-            ZipEntry raw = zf.getEntry(pack.path+"/raw");
-            ZipEntry data = zf.getEntry(pack.path+"/data");
             ZipInputStream zis = new ZipInputStream(new FileInputStream("packs/"+pack.filename));
             ZipEntry ze;
             int total = zis.available();
             while ((ze = zis.getNextEntry())!= null){
-                if (ze.toString().startsWith(pack.path) && !ze.toString().equals(pack.path)) {
+                if (ze.toString().startsWith(pack.path) && !ze.toString().contains("\\save\\") && !ze.toString().equals(pack.path)) {
                     String fname = main.install+"\\"+ze.toString().replace(pack.path,"").replace("/","\\");
                     if (ze.isDirectory()){
                         new File(fname).mkdir();

diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: main
+
diff --git a/src/Sampler.java b/src/Sampler.java
@@ -14,6 +14,11 @@ public void paintComponent(Graphics g){
         Graphics2D g2d = (Graphics2D)g;
         g2d.fillRect(0,0,860,680);
         icon.paintIcon(this,g,0,0);
+        g2d.setColor(new Color(0,0,0,150));
+        g2d.fillRect(0,0,860,75);
+        g2d.setColor(new Color(255,255,255));
+        g2d.setFont(new Font("Times",Font.PLAIN,40));
+        g2d.drawString("Dwarf Fortress",300,50);
     }
 
     public void changeImage(String image){

diff --git a/src/main.java b/src/main.java
@@ -59,6 +59,8 @@ public static void main(String[] args) {
         frame = new JFrame("DF Launcher");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(860,680);
+        frame.setResizable(false);
+        frame.setIconImage(new ImageIcon("samples/dwarfsx0.jpg").getImage());
 
         BorderLayout bl = new BorderLayout();
         frame.setLayout(bl);