Skip to content
This repository has been archived by the owner on Jan 4, 2024. It is now read-only.

Commit

Permalink
Deleting the obj updater
Browse files Browse the repository at this point in the history
Deleting all references to the obj updater since all the download sources are down for a while
  • Loading branch information
Bussun authored and Bussun committed Apr 17, 2020
1 parent cbf4a21 commit c1919f9
Show file tree
Hide file tree
Showing 12 changed files with 377 additions and 611 deletions.
Binary file modified dist/Whitehole.jar
Binary file not shown.
30 changes: 16 additions & 14 deletions nbproject/build-impl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,6 @@ is divided into following sections:
<istrue value="${not.archive.disabled}"/>
</or>
</condition>
<condition property="do.mkdist">
<and>
<isset property="do.archive"/>
<isset property="libs.CopyLibs.classpath"/>
<not>
<istrue value="${mkdist.disabled}"/>
</not>
<not>
<istrue value="${modules.supported.internal}"/>
</not>
</and>
</condition>
<condition property="do.archive+manifest.available">
<and>
<isset property="manifest.available"/>
Expand Down Expand Up @@ -1193,13 +1181,27 @@ is divided into following sections:
<attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
</manifest>
</target>
<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
<target depends="init,compile" name="-check-do-mkdist">
<condition property="do.mkdist">
<and>
<isset property="do.archive"/>
<isset property="libs.CopyLibs.classpath"/>
<not>
<istrue value="${mkdist.disabled}"/>
</not>
<not>
<available file="${build.classes.dir}/module-info.class"/>
</not>
</and>
</condition>
</target>
<target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
<echo level="info">To run this application from the command line without Ant, try:</echo>
<property location="${dist.jar}" name="dist.jar.resolved"/>
<echo level="info">java -jar "${dist.jar.resolved}"</echo>
</target>
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
<property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
<property location="${dist.jar}" name="dist.jar.resolved"/>
Expand Down
4 changes: 2 additions & 2 deletions nbproject/genfiles.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=8064a381@1.79.1.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=8e1fcd80
nbproject/build-impl.xml.script.CRC32=0b85ad74
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48
nbproject/build-impl.xml.script.CRC32=b644062c
nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.94.0.48
143 changes: 0 additions & 143 deletions src/com/thesuncat/whitehole/ObjectDBUpdater.java

This file was deleted.

7 changes: 1 addition & 6 deletions src/com/thesuncat/whitehole/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
public class Settings {
public static void init() {
Preferences prefs = Preferences.userRoot();
objectDB_url = prefs.get("objectDB.url", "http://neomariogalaxy.bplaced.net/objectdb/smg_download.php");
objectDB_update = prefs.getBoolean("objectDB.update", true);
arc_enc = prefs.getBoolean("arc.enc", true);
editor_shaders = prefs.getBoolean("editor.shaders", true);
editor_fastDrag = prefs.getBoolean("editor.fastDrag", false);
Expand All @@ -44,8 +42,6 @@ public static void init() {

public static void save() {
Preferences prefs = Preferences.userRoot();
prefs.put("objectDB.url", objectDB_url);
prefs.putBoolean("objectDB.update", objectDB_update);
prefs.putBoolean("arc.enc", arc_enc);
prefs.putBoolean("editor.shaders", editor_shaders);
prefs.putBoolean("editor.fastDrag", editor_fastDrag);
Expand All @@ -71,9 +67,8 @@ public static void saveEditorPrefs(boolean area, boolean gravity, boolean camera
init();
}

public static String objectDB_url;
public static boolean associated;
public static boolean objectDB_update, arc_enc, gameDir, dark, richPresence, aa, fakeCol, reverseRot, legacy, japanese, fileNames;
public static boolean arc_enc, gameDir, dark, richPresence, aa, fakeCol, reverseRot, legacy, japanese, fileNames;
public static boolean editor_shaders, editor_fastDrag;
public static boolean showAreas, showCameras, showGravity, showPaths, showAxis;
}
Loading

0 comments on commit c1919f9

Please sign in to comment.