Reverted new UI to fix fatal bug with JAR and EXE not opening

Zodsmar · Jul 15, 2021 · 1a865d9 · 1a865d9
1 parent 03486cd
commit 1a865d9
Show file tree

Hide file tree

Showing 6 changed files with 423 additions and 56 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,6 +10,8 @@ plugins {
     id 'org.openjfx.javafxplugin' version '0.0.8'
     id 'edu.sc.seis.launch4j' version '2.4.6'
 }
+apply plugin: 'application'
+applicationDefaultJvmArgs = ["--illegal-access=permit"]
 
 dependencies {
     implementation 'com.googlecode.json-simple:json-simple:1.1.1'
@@ -40,20 +42,24 @@ dependencies {
                 transitive = false;
                 //changing = true;
             }
-
+    implementation('com.github.KaptainWutax:TerrainUtils:main-SNAPSHOT')
+            {
+                transitive = false;
+                //changing = true;
+            }
     implementation('com.github.KaptainWutax:NoiseUtils:main-SNAPSHOT')
             {
                 transitive = false
                 //changing = true
             }
 
-    compile 'com.jfoenix:jfoenix:9.0.10'
+    //compile 'com.jfoenix:jfoenix:9.0.10'
 
 }
 
 
 group = 'sassa'
-version = 'v0.6.2'
+version = 'v0.6.3'
 sourceCompatibility = '1.8'
 String stringVersion = version
 

diff --git a/src/main/java/sassa/gui/fxmlController.java b/src/main/java/sassa/gui/fxmlController.java
@@ -1,8 +1,8 @@
 package sassa.gui;
 
 
-import com.jfoenix.controls.JFXComboBox;
-import com.jfoenix.controls.JFXTextField;
+//import com.jfoenix.controls.JFXComboBox;
+//import com.jfoenix.controls.JFXTextField;
 import java.util.regex.*;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -69,7 +69,7 @@ public class fxmlController implements Initializable {
     private Text timeElapsedSinceLast;
 
     @FXML
-    private JFXComboBox<String> mcVersions;
+    private ComboBox<String> mcVersions;
 
 
     @FXML
@@ -145,7 +145,7 @@ public class fxmlController implements Initializable {
     private Label outputFileText;
 
     @FXML
-    private JFXComboBox<String> worldType;
+    private ComboBox<String> worldType;
 
     //Get the grid in Biomes tab to dynamically build it.
     @FXML
@@ -544,13 +544,13 @@ private void buildGridPane(GridPane grid, ArrayList<String> searchList, boolean
                     grid.add(tempGrid, j, i);
 
                     Text tempText = new Text(searchList.get(k));
-                    JFXComboBox<String> temp = new JFXComboBox<String>(FXCollections
+                    ComboBox<String> temp = new ComboBox<String>(FXCollections
                             .observableArrayList(include_exclude_txt));
                     tempGrid.getChildren().add(tempText);
                     tempGrid.getChildren().add(temp);
                     if(textField == true) {
 
-                        JFXTextField tempField = new JFXTextField();
+                        TextField tempField = new TextField();
                         tempField.setMaxWidth(50);
                         tempField.setTooltip(new Tooltip("How many structures do you want to have? (Default if blank is 1 and its a minimum value)"));
                         tempGrid.getChildren().add(tempField);

diff --git a/src/main/java/sassa/main/mainApp.java b/src/main/java/sassa/main/mainApp.java
@@ -12,7 +12,7 @@
 
 public class mainApp extends Application {
 
-    public static final String VERSION = "v0.6.2";
+    public static final String VERSION = "v0.6.3";
     public static boolean DEV_MODE = false;
 
 	/*

diff --git a/src/main/java/sassa/searcher/Searcher.java b/src/main/java/sassa/searcher/Searcher.java
@@ -5,6 +5,7 @@
 import kaptainwutax.biomeutils.source.EndBiomeSource;
 import kaptainwutax.biomeutils.source.NetherBiomeSource;
 import kaptainwutax.biomeutils.source.OverworldBiomeSource;
+import kaptainwutax.featureutils.misc.SpawnPoint;
 import kaptainwutax.featureutils.structure.*;
 import kaptainwutax.mcutils.rand.ChunkRand;
 import kaptainwutax.mcutils.state.Dimension;
@@ -13,6 +14,7 @@
 import kaptainwutax.mcutils.rand.seed.WorldSeed;
 import kaptainwutax.mcutils.util.math.DistanceMetric;
 import kaptainwutax.mcutils.util.math.Vec3i;
+import kaptainwutax.terrainutils.terrain.OverworldTerrainGenerator;
 import sassa.gui.Variables;
 import sassa.gui.fxmlController;
 import sassa.util.Singleton;
@@ -191,8 +193,8 @@ public static BiomeSource getBiomeSource(Dimension dimension, long worldSeed) {
 
     public static boolean checkSpawnPoint(BiomeSource source) {
         //if(source.getDimension() == Dimension.OVERWORLD) {
-        OverworldBiomeSource oSource = (OverworldBiomeSource) source;
-        BPos spawn = oSource.getSpawnPoint();
+        //OverworldBiomeSource oSource = (OverworldBiomeSource) source;
+        BPos spawn = new SpawnPoint().getSpawnPoint(new OverworldTerrainGenerator(source));
         int x = Integer.parseInt(Singleton.getInstance().getXCoordSpawn().getText());
         int z = Integer.parseInt(Singleton.getInstance().getZCoordSpawn().getText());
         int margin = Integer.parseInt(Singleton.getInstance().getMarginOfError().getText());