EggStarGalaxy to NeoMarioGalaxy

SunakazeKun · Aug 5, 2016 · 6a8ff72 · 6a8ff72
1 parent e664682
commit 6a8ff72
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 19 deletions.
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -4,8 +4,24 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/C:/Users/Aurum/%23Mario/Whitehole-master/src/Resources/Hash.txt</file>
-            <file>file:/C:/Users/Aurum/%23Mario/Whitehole-master/src/Resources/ZoneHash.txt</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/PlanetObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/rendering/ObjectModelSubstitutor.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/BcsvEditorForm.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/ObjectDBUpdater.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/ChildObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/PathPointObject.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/PathObject.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/ChangeObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/GeneralObject.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/rendering/RendererCache.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/MapPartObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/AreaObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/StartObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/GeneralPosObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/DebugObj.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/SettingsForm.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/rendering/PlanetRenderer.java</file>
+            <file>file:/C:/Users/Aurum/Documents/GitHub/Whitehole/src/whitehole/smg/object/SoundObj.java</file>
         </group>
     </open-files>
 </project-private>
diff --git a/src/whitehole/ObjectDBUpdater.java b/src/whitehole/ObjectDBUpdater.java
@@ -41,7 +41,7 @@ public void run()
             String ts = String.format("&ts=%1$d", ObjectDB.timestamp);
             URL url = new URL ("http://kuribo64.net/whitehole/objectdb.php?whitehole&gzip" + ts);
             if (Settings.dbEggStarGalaxy)
-                url = new URL ("http://eggstargalaxy.bplaced.net/whitehole/objectdb.php?whitehole&gzip" + ts);
+                url = new URL ("http://neomariogalaxy.bplaced.net/board/whitehole/objectdb.php?whitehole&gzip" + ts);
             URLConnection conn = url.openConnection();
             DataInputStream dis = new DataInputStream(conn.getInputStream());
 

diff --git a/src/whitehole/SettingsForm.form b/src/whitehole/SettingsForm.form
@@ -67,7 +67,7 @@
                   <Component id="chkObjectDBUpdate" alignment="0" min="-2" max="-2" attributes="0"/>
                   <Component id="lblRendering" alignment="0" min="-2" max="-2" attributes="0"/>
                   <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
-                  <Component id="radEggStarGalaxy" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="radNeoMarioGalaxy" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="0" pref="8" max="32767" attributes="0"/>
           </Group>
@@ -91,7 +91,7 @@
               <EmptySpace max="-2" attributes="0"/>
               <Component id="radKuribo64" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="radEggStarGalaxy" min="-2" max="-2" attributes="0"/>
+              <Component id="radNeoMarioGalaxy" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="btnCancel" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -166,12 +166,12 @@
         <Property name="text" type="java.lang.String" value="Kuribo64"/>
       </Properties>
     </Component>
-    <Component class="javax.swing.JRadioButton" name="radEggStarGalaxy">
+    <Component class="javax.swing.JRadioButton" name="radNeoMarioGalaxy">
       <Properties>
         <Property name="buttonGroup" type="javax.swing.ButtonGroup" editor="org.netbeans.modules.form.RADComponent$ButtonGroupPropertyEditor">
           <ComponentRef name="buttonGroup1"/>
         </Property>
-        <Property name="text" type="java.lang.String" value="EggStarGalaxy"/>
+        <Property name="text" type="java.lang.String" value="Neo Mario Galaxy"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel1">

diff --git a/src/whitehole/SettingsForm.java b/src/whitehole/SettingsForm.java
@@ -45,7 +45,7 @@ private void initComponents() {
         lblObjectDatabase = new javax.swing.JLabel();
         lblRendering = new javax.swing.JLabel();
         radKuribo64 = new javax.swing.JRadioButton();
-        radEggStarGalaxy = new javax.swing.JRadioButton();
+        radNeoMarioGalaxy = new javax.swing.JRadioButton();
         jLabel1 = new javax.swing.JLabel();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -91,8 +91,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
         buttonGroup1.add(radKuribo64);
         radKuribo64.setText("Kuribo64");
 
-        buttonGroup1.add(radEggStarGalaxy);
-        radEggStarGalaxy.setText("EggStarGalaxy");
+        buttonGroup1.add(radNeoMarioGalaxy);
+        radNeoMarioGalaxy.setText("Neo Mario Galaxy");
 
         jLabel1.setText("Select a server to download the database from:");
 
@@ -126,7 +126,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                     .addComponent(chkObjectDBUpdate)
                     .addComponent(lblRendering)
                     .addComponent(jLabel1)
-                    .addComponent(radEggStarGalaxy))
+                    .addComponent(radNeoMarioGalaxy))
                 .addGap(0, 8, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
@@ -147,7 +147,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(radKuribo64)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(radEggStarGalaxy)
+                .addComponent(radNeoMarioGalaxy)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(btnCancel)
@@ -164,7 +164,7 @@ private void formWindowOpened(java.awt.event.WindowEvent evt)//GEN-FIRST:event_f
         chkUseShaders.setSelected(Settings.useShaders);
         chkFastDrag.setSelected(Settings.fastDrag);
         radKuribo64.setSelected(Settings.dbKuribo64);
-        radEggStarGalaxy.setSelected(Settings.dbEggStarGalaxy);
+        radNeoMarioGalaxy.setSelected(Settings.dbEggStarGalaxy);
     }//GEN-LAST:event_formWindowOpened
 
     private void btnCancelActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_btnCancelActionPerformed
@@ -178,7 +178,7 @@ private void btnOkActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:eve
         Settings.useShaders = chkUseShaders.isSelected();
         Settings.fastDrag = chkFastDrag.isSelected();
         Settings.dbKuribo64 = radKuribo64.isSelected();
-        Settings.dbEggStarGalaxy = radEggStarGalaxy.isSelected();
+        Settings.dbEggStarGalaxy = radNeoMarioGalaxy.isSelected();
         Settings.save();
         dispose();
     }//GEN-LAST:event_btnOkActionPerformed
@@ -198,7 +198,7 @@ private void chkUseShadersActionPerformed(java.awt.event.ActionEvent evt) {//GEN
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel lblObjectDatabase;
     private javax.swing.JLabel lblRendering;
-    private javax.swing.JRadioButton radEggStarGalaxy;
     private javax.swing.JRadioButton radKuribo64;
+    private javax.swing.JRadioButton radNeoMarioGalaxy;
     // End of variables declaration//GEN-END:variables
 }
diff --git a/src/whitehole/smg/object/CameraCubeObj.java b/src/whitehole/smg/object/CameraCubeObj.java
@@ -77,10 +77,6 @@ public CameraCubeObj(ZoneArchive zone, String filepath, int game, String objname
         data.put("Obj_arg2", -1);
         data.put("Obj_arg3", -1);      
 
-        data.put("0x50F5D5E6", -1);
-        data.put("0xCDC4FEAD", -1);
-        data.put("Validity", "Valid");
-
         data.put("SW_APPEAR", -1);
         data.put("SW_A",  -1);
         data.put("SW_B", -1);