Java 11.0.2 migration (#32)

* Code compiles - execution NOT tested * updating gitignore * Removed intellij settings files * Removed more intellij files * Added exclusion for JDK classes. * Fixed purchasing script for vendors that have listed coin types. * Updated script to not kick off until the entire preload is complete. * adds static name entry for Solo movie poster and tcg9 vendor entry * clean up empty and orphaned object templates * adds placeholder black market (static) spawns * corrects entries for the video game table to correctly set it in tcg series 2 and remove series 1 console errors * Updated gitignore and removed intellij project files * Fixed appearance reference for thranta payroll and kashyyyk door, added skipLosCheck objvar due to cannit see issue. Requires updated src * Fixed appearance and template for terminal (#2) * Fixed appearance and template for terminal (#3) * Fixed appearance and template for terminal (#4) * Deleted another faulty/orphaned object template * Fixed gcw ranks option on frog. Only issue is that it doesn't award the officer commands or badges. * Fixed some unneeded java 11 changes
2026-10-16 07:13:29 -04:00 · 2019-04-18 18:31:52 -05:00
parent a4298e618f
commit 5c2e112349
1815 changed files with 36918 additions and 49649 deletions
@@ -119,9 +119,8 @@ public class content_generation extends script.base_script
        if (strCommands[0].equals("cleanUpBuildout"))
        {
            obj_id[] objContents = getShipContents(getTopMostContainer(self));
-            for (int intI = 0; intI < objContents.length; intI++)
-            {
-                destroyObject(objContents[intI]);
+            for (obj_id objContent : objContents) {
+                destroyObject(objContent);
            }
            sendSystemMessageTestingOnly(self, "Cleaned Up");
        }
@@ -180,11 +179,9 @@ public class content_generation extends script.base_script
                return SCRIPT_CONTINUE;
            }
            obj_id[] objTestObjects = getAllObjectsWithScript(getLocation(self), 320000, "space.combat.combat_ship");
-            for (int intI = 0; intI < objTestObjects.length; intI++)
-            {
-                if (!space_utils.isPlayerControlledShip(objTestObjects[intI]))
-                {
-                    obj_id objShip = objTestObjects[intI];
+            for (obj_id objTestObject : objTestObjects) {
+                if (!space_utils.isPlayerControlledShip(objTestObject)) {
+                    obj_id objShip = objTestObject;
                    ship_ai.unitSetPilotType(objShip, dctShipInfo.getString("strPilotType"));
                    setShipEngineAccelerationRate(objShip, dctShipInfo.getFloat("engine_accel"));
                    setShipEngineDecelerationRate(objShip, dctShipInfo.getFloat("engine_decel"));
@@ -199,8 +196,7 @@ public class content_generation extends script.base_script
                    setShipEngineSpeedRotationFactorMinimum(objShip, dctShipInfo.getFloat("speed_rotation_factor_min"));
                    setShipEngineSpeedRotationFactorOptimal(objShip, dctShipInfo.getFloat("speed_rotation_factor_optimal"));
                    setShipSlideDampener(objShip, dctShipInfo.getFloat("slideDamp"));
-                    if (isShipSlotInstalled(objShip, space_crafting.BOOSTER))
-                    {
+                    if (isShipSlotInstalled(objShip, space_crafting.BOOSTER)) {
                        setShipBoosterEnergyCurrent(objShip, dctShipInfo.getFloat("booster_energy"));
                        setShipBoosterEnergyMaximum(objShip, dctShipInfo.getFloat("booster_energy"));
                        setShipBoosterEnergyRechargeRate(objShip, dctShipInfo.getFloat("booster_recharge"));
@@ -448,30 +444,26 @@ public class content_generation extends script.base_script
            }
            obj_id[] objObjects = getBuildingContents(objBuilding);
            sendSystemMessageTestingOnly(self, "dumping contents of " + objBuilding);
-            for (int intI = 0; intI < objObjects.length; intI++)
-            {
-                if (isDumpable(objObjects[intI], true))
-                {
+            for (obj_id objObject : objObjects) {
+                if (isDumpable(objObject, true)) {
                    dictionary dctRow = new dictionary();
                    int intNoCreate = 0;
-                    locTest = getLocation(objObjects[intI]);
-                    String strTemplate = getTemplateName(objObjects[intI]);
+                    locTest = getLocation(objObject);
+                    String strTemplate = getTemplateName(objObject);
                    float fltX = locTest.x;
                    float fltY = locTest.y;
                    float fltZ = locTest.z;
                    String strCellName = space_utils.getCellName(objBuilding, locTest.cell);
-                    if (hasObjVar(objObjects[intI], "intNoCreate"))
-                    {
+                    if (hasObjVar(objObject, "intNoCreate")) {
                        intNoCreate = 1;
                    }
                    String strLocationList = "";
-                    if (hasObjVar(objObjects[intI], "strLocationList"))
-                    {
-                        strLocationList = getStringObjVar(objObjects[intI], "strLocationList");
+                    if (hasObjVar(objObject, "strLocationList")) {
+                        strLocationList = getStringObjVar(objObject, "strLocationList");
                    }
                    dctRow.put("strLocationList", strLocationList);
                    dctRow.put("intNoCreate", intNoCreate);
-                    transform vctTest = getTransform_o2p(objObjects[intI]);
+                    transform vctTest = getTransform_o2p(objObject);
                    vector vctJ = vctTest.getLocalFrameJ_p();
                    vector vctK = vctTest.getLocalFrameK_p();
                    vector vctP = vctTest.getPosition_p();
@@ -486,9 +478,9 @@ public class content_generation extends script.base_script
                    dctRow.put("fltPZ", vctP.z);
                    dctRow.put("strCellName", strCellName);
                    dctRow.put("strTemplate", strTemplate);
-                    String strObjVars = getPackedObjvars(objObjects[intI]);
+                    String strObjVars = getPackedObjvars(objObject);
                    dctRow.put("strObjVars", strObjVars);
-                    String strScripts = utils.getPackedScripts(objObjects[intI]);
+                    String strScripts = utils.getPackedScripts(objObject);
                    dctRow.put("strScripts", strScripts);
                    datatable.serverDataTableAddRow(strDataTable, dctRow);
                }
@@ -504,9 +496,8 @@ public class content_generation extends script.base_script
        {
            obj_id objNPC = create.object("nym_guard", getLocation(self));
            String[] strScripts = utils.getUsableScriptList(objNPC);
-            for (int intI = 0; intI < strScripts.length; intI++)
-            {
-                detachScript(objNPC, strScripts[intI]);
+            for (String strScript : strScripts) {
+                detachScript(objNPC, strScript);
            }
            setObjVar(objNPC, "strSequenceIdentifier", strCommands[1]);
            attachScript(objNPC, "content_tools.sequencer_object");
@@ -614,10 +605,9 @@ public class content_generation extends script.base_script
        {
            obj_id[] objTestObjects = getObjectsInRange(getLocation(self), 320000);
            sendSystemMessageTestingOnly(self, "Notifying " + objTestObjects.length);
-            for (int intI = 0; intI < objTestObjects.length; intI++)
-            {
+            for (obj_id objTestObject : objTestObjects) {
                Object[] newParams = new Object[1];
-                newParams[0] = objTestObjects[intI];
+                newParams[0] = objTestObject;
                space_utils.callTrigger("OnPreloadComplete", newParams);
            }
            sendSystemMessageTestingOnly(self, "Reset zone");
@@ -825,13 +815,11 @@ public class content_generation extends script.base_script
        String strData = "";
        String[] strTypes = dataTableGetStringColumnNoDefaults("datatables/space_crafting/interior_component_lookup.iff", "strManagerName");
        boolean boolValid = false;
-        for (int intI = 0; intI < strTypes.length; intI++)
-        {
-            if (strTypes[intI].equals(strTypeToCreate))
-            {
+        for (String strType : strTypes) {
+            if (strType.equals(strTypeToCreate)) {
                boolValid = true;
            }
-            strData = strData + strTypes[intI] + "\n";
+            strData = strData + strType + "\n";
        }
        if (!boolValid)
        {
@@ -874,13 +862,11 @@ public class content_generation extends script.base_script
        }
        String[] strCells = getCellNames(objShip);
        boolean boolValid = false;
-        for (int intI = 0; intI < strCells.length; intI++)
-        {
-            if (strCells[intI].equals(strCellToLock))
-            {
+        for (String strCell : strCells) {
+            if (strCell.equals(strCellToLock)) {
                boolValid = true;
            }
-            strData = strData + strCells[intI] + "\n";
+            strData = strData + strCell + "\n";
        }
        if (!boolValid)
        {
@@ -970,11 +956,8 @@ public class content_generation extends script.base_script
        String[] strStations = utils.getStringArrayScriptVar(self, "strStations");
        utils.removeScriptVar(self, "strStations");
        boolean boolTest = false;
-        for (int intI = 0; intI < strStations.length; intI++)
-        {
-            String strTest = strStations[intI];
-            if (strTest.equals(strStationType))
-            {
+        for (String strTest : strStations) {
+            if (strTest.equals(strStationType)) {
                boolTest = true;
            }
        }
@@ -982,9 +965,8 @@ public class content_generation extends script.base_script
        {
            String strStationString = "";
            utils.setScriptVar(self, "strStations", strStations);
-            for (int intI = 0; intI < strStations.length; intI++)
-            {
-                strStationString = strStationString + strStations[intI] + "\n";
+            for (String strStation : strStations) {
+                strStationString = strStationString + strStation + "\n";
            }
            sui.inputbox(self, self, "INVALID STATION TYPE! What type of spaceStation is this? valid names are " + strStationString, sui.OK_CANCEL, "Test", sui.INPUT_NORMAL, null, "makeSpaceStation", null);
            return SCRIPT_CONTINUE;
@@ -1021,11 +1003,9 @@ public class content_generation extends script.base_script
        }
        if (strAdditionalScripts != null)
        {
-            for (int intI = 0; intI < strAdditionalScripts.length; intI++)
-            {
-                if (!strAdditionalScripts[intI].equals(""))
-                {
-                    attachScript(objStation, strAdditionalScripts[intI]);
+            for (String strAdditionalScript : strAdditionalScripts) {
+                if (!strAdditionalScript.equals("")) {
+                    attachScript(objStation, strAdditionalScript);
                }
            }
        }
@@ -1054,11 +1034,8 @@ public class content_generation extends script.base_script
        String[] strStations = utils.getStringArrayScriptVar(self, "strStations");
        utils.removeScriptVar(self, "strStations");
        boolean boolTest = false;
-        for (int intI = 0; intI < strStations.length; intI++)
-        {
-            String strTest = strStations[intI];
-            if (strTest.equals(strStationType))
-            {
+        for (String strTest : strStations) {
+            if (strTest.equals(strStationType)) {
                boolTest = true;
            }
        }
@@ -1066,9 +1043,8 @@ public class content_generation extends script.base_script
        {
            String strStationString = "";
            utils.setScriptVar(self, "strStations", strStations);
-            for (int intI = 0; intI < strStations.length; intI++)
-            {
-                strStationString = strStationString + strStations[intI] + "\n";
+            for (String strStation : strStations) {
+                strStationString = strStationString + strStation + "\n";
            }
            sui.inputbox(self, self, "INVALID STATION TYPE! What type of entry station is this? valid names are " + strStationString, sui.OK_CANCEL, "Test", sui.INPUT_NORMAL, null, "makeEntrySpaceStation", null);
            return SCRIPT_CONTINUE;
@@ -1502,9 +1478,8 @@ public class content_generation extends script.base_script
            strWaves = utils.getResizeableStringArrayScriptVar(self, "strWaves");
        }
        String strData = "";
-        for (int intI = 0; intI < strWaves.size(); intI++)
-        {
-            strData = strData + ((String)strWaves.get(intI)) + "\n";
+        for (Object strWave1 : strWaves) {
+            strData = strData + ((String) strWave1) + "\n";
        }
        if (isValidWave(strWave))
        {
@@ -1543,9 +1518,8 @@ public class content_generation extends script.base_script
            strSpawns = utils.getResizeableStringArrayScriptVar(self, "strSpawns");
        }
        String strData = "";
-        for (int intI = 0; intI < strSpawns.size(); intI++)
-        {
-            strData = strData + ((String)strSpawns.get(intI)) + "\n";
+        for (Object strSpawn : strSpawns) {
+            strData = strData + ((String) strSpawn) + "\n";
        }
        if (isValidMobString(strSpawnToAdd))
        {
@@ -1735,57 +1709,33 @@ public class content_generation extends script.base_script
    }
    public boolean isValidAsteroidType(String strAsteroidType) throws InterruptedException
    {
-        if (strAsteroidType.equals("iron"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("silicaceous"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("carbonaceous"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("ice"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("obsidian"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("diamond"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("crystal"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("petrochem"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("acid"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("cyanomethanic"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("sulfuric"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("methane"))
-        {
-            return true;
-        }
-        else if (strAsteroidType.equals("organometallic"))
-        {
-            return true;
+        switch (strAsteroidType) {
+            case "iron":
+                return true;
+            case "silicaceous":
+                return true;
+            case "carbonaceous":
+                return true;
+            case "ice":
+                return true;
+            case "obsidian":
+                return true;
+            case "diamond":
+                return true;
+            case "crystal":
+                return true;
+            case "petrochem":
+                return true;
+            case "acid":
+                return true;
+            case "cyanomethanic":
+                return true;
+            case "sulfuric":
+                return true;
+            case "methane":
+                return true;
+            case "organometallic":
+                return true;
        }
        return false;
    }
@@ -1832,10 +1782,9 @@ public class content_generation extends script.base_script
            {
                String[] strNames = dctReturnInfo.getStringArray("strNames");
                String strData = "";
-                for (int intI = 0; intI < strNames.length; intI++)
-                {
+                for (String strName : strNames) {
                    LOG("space", "strData is " + strData);
-                    strData = strData + strNames[intI] + "\n";
+                    strData = strData + strName + "\n";
                }
                sui.inputbox(self, self, "What patrol point batches do you want to use? Valid points are: \n " + strData, sui.OK_CANCEL, "Test", sui.INPUT_NORMAL, null, "useExistingPatrolPoint", null);
            }
@@ -1867,9 +1816,8 @@ public class content_generation extends script.base_script
        if (intIndex < 0)
        {
            String strData = "";
-            for (int intI = 0; intI < strNames.length; intI++)
-            {
-                strData = strData + strNames[intI] + "\n";
+            for (String strName : strNames) {
+                strData = strData + strName + "\n";
            }
            sui.inputbox(self, self, "INVALID PATROL POINT NAME\n What patrol point batches do you want to use? Valid points are: \n " + strData, sui.OK_CANCEL, "Test", sui.INPUT_NORMAL, null, "useExistingPatrolPoint", null);
        }
@@ -1943,21 +1891,16 @@ public class content_generation extends script.base_script
        strNames.setSize(0);
        Vector intCount = new Vector();
        intCount.setSize(0);
-        for (int intI = 0; intI < objObjects.length; intI++)
-        {
-            String strPatrolPointName = getStringObjVar(objObjects[intI], "strName");
-            if (strPatrolPointName != null)
-            {
+        for (obj_id objObject : objObjects) {
+            String strPatrolPointName = getStringObjVar(objObject, "strName");
+            if (strPatrolPointName != null) {
                String strRawName = getRawPatrolPointName(strPatrolPointName);
                int intIndex = utils.getElementPositionInArray(strNames, strRawName);
-                if (intIndex < 0)
-                {
+                if (intIndex < 0) {
                    strNames = utils.addElement(strNames, strRawName);
                    intCount = utils.addElement(intCount, 1);
-                }
-                else 
-                {
-                    intCount.set(intIndex, new Integer(((Integer)intCount.get(intIndex)).intValue() + 1));
+                } else {
+                    intCount.set(intIndex, (Integer) intCount.get(intIndex) + 1);
                }
                LOG("space", "strNames length is " + strNames.size());
            }
@@ -2064,22 +2007,19 @@ public class content_generation extends script.base_script
        }
        String strString = sui.getInputBoxText(params);
        int intPhase = -1;
-        if (strString.equals("ALL"))
-        {
-            intPhase = -1;
-        }
-        else if (strString.equals("IMPERIAL"))
-        {
-            intPhase = space_battlefield.STATE_IMPERIAL;
-        }
-        else if (strString.equals("REBEL"))
-        {
-            intPhase = space_battlefield.STATE_REBEL;
-        }
-        else 
-        {
-            sui.inputbox(self, self, "INVALID STRING " + strString + "What Phase do you want these spawners to be activated in? Valid options are ALL, IMPERIAL and REBEL.\nIMPERIAL means that the empire won the battlezone and REBEL treasure boats spawn here.", sui.OK_CANCEL, "Test", sui.INPUT_NORMAL, null, "setActivationPhase", null);
-            return SCRIPT_CONTINUE;
+        switch (strString) {
+            case "ALL":
+                intPhase = -1;
+                break;
+            case "IMPERIAL":
+                intPhase = space_battlefield.STATE_IMPERIAL;
+                break;
+            case "REBEL":
+                intPhase = space_battlefield.STATE_REBEL;
+                break;
+            default:
+                sui.inputbox(self, self, "INVALID STRING " + strString + "What Phase do you want these spawners to be activated in? Valid options are ALL, IMPERIAL and REBEL.\nIMPERIAL means that the empire won the battlezone and REBEL treasure boats spawn here.", sui.OK_CANCEL, "Test", sui.INPUT_NORMAL, null, "setActivationPhase", null);
+                return SCRIPT_CONTINUE;
        }
        utils.setScriptVar(self, "intActivationPhase", intPhase);
        sendSystemMessageTestingOnly(self, "DoNE");
@@ -2124,9 +2064,8 @@ public class content_generation extends script.base_script
            obj_id[] objPatrolPoints = utils.getObjIdArrayScriptVar(self, "objPatrolPoints");
            if (objPatrolPoints != null)
            {
-                for (int intI = 0; intI < objPatrolPoints.length; intI++)
-                {
-                    destroyObject(objPatrolPoints[intI]);
+                for (obj_id objPatrolPoint : objPatrolPoints) {
+                    destroyObject(objPatrolPoint);
                }
            }
        }
@@ -2281,11 +2220,9 @@ public class content_generation extends script.base_script
            LOG("space", "Bad column name of " + strColumn);
            return false;
        }
-        for (int intI = 0; intI < strColumn.length; intI++)
-        {
-            if (!isValidMobString(strColumn[intI]))
-            {
-                sendSystemMessageTestingOnly(getSelf(), "BAD DATA IN WAVE FILE, COLUMN " + strWave + " entry is " + strColumn[intI]);
+        for (String s : strColumn) {
+            if (!isValidMobString(s)) {
+                sendSystemMessageTestingOnly(getSelf(), "BAD DATA IN WAVE FILE, COLUMN " + strWave + " entry is " + s);
                return false;
            }
        }
@@ -2445,14 +2382,11 @@ public class content_generation extends script.base_script
        Vector objContents = new Vector();
        objContents.setSize(0);
        obj_id[] objCells = getContents(objObject);
-        for (int intI = 0; intI < objCells.length; intI++)
-        {
-            obj_id[] objTestContents = getContents(objCells[intI]);
-            if ((objTestContents != null) && (objTestContents.length > 0))
-            {
-                for (int intJ = 0; intJ < objTestContents.length; intJ++)
-                {
-                    objContents = utils.addElement(objContents, objTestContents[intJ]);
+        for (obj_id objCell : objCells) {
+            obj_id[] objTestContents = getContents(objCell);
+            if ((objTestContents != null) && (objTestContents.length > 0)) {
+                for (obj_id objTestContent : objTestContents) {
+                    objContents = utils.addElement(objContents, objTestContent);
                }
            }
        }
@@ -2517,14 +2451,11 @@ public class content_generation extends script.base_script
        Vector objContents = new Vector();
        objContents.setSize(0);
        obj_id[] objCells = getContents(objObject);
-        for (int intI = 0; intI < objCells.length; intI++)
-        {
-            obj_id[] objTestContents = getContents(objCells[intI]);
-            if ((objTestContents != null) && (objTestContents.length > 0))
-            {
-                for (int intJ = 0; intJ < objTestContents.length; intJ++)
-                {
-                    objContents = utils.addElement(objContents, objTestContents[intJ]);
+        for (obj_id objCell : objCells) {
+            obj_id[] objTestContents = getContents(objCell);
+            if ((objTestContents != null) && (objTestContents.length > 0)) {
+                for (obj_id objTestContent : objTestContents) {
+                    objContents = utils.addElement(objContents, objTestContent);
                }
            }
        }